Merge branch 'main' into release-matrix-sdk-crypto-js-v0.1.0-alpha.8

Author: florianduros

Cargo.lock

@@ -32,8 +32,8 @@ eyeball = "0.6.0"
 eyeball-im = "0.2.0"
 futures-util = { version = "0.3.26", default-features = false, features = ["alloc"] }
 http = "0.2.6"
-ruma = { git = "https://github.com/ruma/ruma", rev = "0143bd9b9f5dcfcaa835afb76f342c12f014f945", features = ["client-api-c", "compat-user-id"] }
-ruma-common = { git = "https://github.com/ruma/ruma", rev = "0143bd9b9f5dcfcaa835afb76f342c12f014f945" }
+ruma = { git = "https://github.com/ruma/ruma", rev = "54a4223caa1c1052464ecdba0f1e08f126e07bcd", features = ["client-api-c", "compat-user-id"] }
+ruma-common = { git = "https://github.com/ruma/ruma", rev = "54a4223caa1c1052464ecdba0f1e08f126e07bcd" }
 once_cell = "1.16.0"
 serde = "1.0.151"
 serde_html_form = "0.2.0"

Cargo.toml

@@ -1,6 +1,8 @@
 # v0.1.0-alpha.8
 
--   Make `unused_fallback_keys` as optional in `Machine.receive_sync_changes`
+-   `importCrossSigningKeys`: change the parameters to be individual keys
+    rather than a `CrossSigningKeyExport` object.
+-   Make `unused_fallback_keys` optional in `Machine.receive_sync_changes`
 
 # v0.1.0-alpha.7
 

bindings/matrix-sdk-crypto-js/CHANGELOG.md

@@ -19,7 +19,11 @@ cd $(dirname "$0")/..
 RUSTFLAGS='-C opt-level=z' WASM_BINDGEN_WEAKREF=1 wasm-pack build --target nodejs --scope matrix-org --out-dir pkg "${WASM_PACK_ARGS[@]}"
 
 # Convert the Wasm into a JS file that exports the base64'ed Wasm.
-echo "module.exports = \`$(base64 pkg/matrix_sdk_crypto_js_bg.wasm)\`;" > pkg/matrix_sdk_crypto_js_bg.wasm.js
+{
+  printf 'module.exports = `'
+  base64 < pkg/matrix_sdk_crypto_js_bg.wasm
+  printf '`;'
+} > pkg/matrix_sdk_crypto_js_bg.wasm.js
 
 # In the JavaScript:
 #  1. Strip out the lines that load the WASM, and our new epilogue.

bindings/matrix-sdk-crypto-js/scripts/build.sh

@@ -397,11 +397,11 @@ impl OlmMachine {
 
     /// Export all the private cross signing keys we have.
     ///
-    /// The export will contain the seed for the ed25519 keys as a
-    /// unpadded base64 encoded string.
+    /// The export will contain the seeds for the ed25519 keys as
+    /// unpadded base64 encoded strings.
     ///
-    /// This method returns None if we don’t have any private cross
-    /// signing keys.
+    /// Returns `null` if we don’t have any private cross signing keys;
+    /// otherwise returns a `CrossSigningKeyExport`.
     #[wasm_bindgen(js_name = "exportCrossSigningKeys")]
     pub fn export_cross_signing_keys(&self) -> Promise {
         let me = self.inner.clone();
@@ -413,12 +413,22 @@ impl OlmMachine {
 
     /// Import our private cross signing keys.
     ///
-    /// The export needs to contain the seed for the ed25519 keys as
-    /// an unpadded base64 encoded string.
+    /// The keys should be provided as unpadded-base64-encoded strings.
+    ///
+    /// Returns a `CrossSigningStatus`.
     #[wasm_bindgen(js_name = "importCrossSigningKeys")]
-    pub fn import_cross_signing_keys(&self, export: store::CrossSigningKeyExport) -> Promise {
+    pub fn import_cross_signing_keys(
+        &self,
+        master_key: Option<String>,
+        self_signing_key: Option<String>,
+        user_signing_key: Option<String>,
+    ) -> Promise {
         let me = self.inner.clone();
-        let export = export.inner;
+        let export = matrix_sdk_crypto::store::CrossSigningKeyExport {
+            master_key,
+            self_signing_key,
+            user_signing_key,
+        };
 
         future_to_promise(async move {
             Ok(me.import_cross_signing_keys(export).await.map(olm::CrossSigningStatus::from)?)

bindings/matrix-sdk-crypto-js/src/machine.rs

@@ -8,6 +8,10 @@ callback interface NotificationDelegate {
     void did_receive_notification(NotificationItem notification);
 };
 
+interface AuthenticationService {};
+interface Span {};
+interface NotificationService {};
+
 dictionary NotificationItem {
     TimelineEvent event;
     string room_id;
@@ -18,6 +22,8 @@ dictionary NotificationItem {
     boolean is_noisy;
     boolean is_direct;
     boolean is_encrypted;
+    boolean is_read;
+    u64 timestamp;
 };
 
 interface TimelineEvent {};

bindings/matrix-sdk-ffi/src/api.udl

@@ -11,7 +11,6 @@ use zeroize::Zeroize;
 use super::{client::Client, client_builder::ClientBuilder, RUNTIME};
 use crate::error::ClientError;
 
-#[derive(uniffi::Object)]
 pub struct AuthenticationService {
     base_path: String,
     passphrase: Option<String>,

bindings/matrix-sdk-ffi/src/authentication_service.rs

@@ -18,6 +18,9 @@ pub struct NotificationItem {
     pub is_noisy: bool,
     pub is_direct: bool,
     pub is_encrypted: bool,
+    pub is_read: bool,
+
+    pub timestamp: u64,
 }
 
 impl NotificationItem {
@@ -45,13 +48,14 @@ impl NotificationItem {
             is_noisy,
             is_direct: room.is_direct().await?,
             is_encrypted: room.is_encrypted().await?,
+            is_read: notification.read,
+            timestamp: notification.ts.0.into(),
         };
         Ok(item)
     }
 }
 
 #[allow(dead_code)]
-#[derive(uniffi::Object)]
 pub struct NotificationService {
     base_path: String,
     user_id: String,

bindings/matrix-sdk-ffi/src/notification_service.rs

@@ -95,7 +95,6 @@ fn span_or_event_enabled(callsite: &'static DefaultCallsite) -> bool {
     }
 }
 
-#[derive(uniffi::Object)]
 pub struct Span(tracing::Span);
 
 #[uniffi::export]

bindings/matrix-sdk-ffi/src/tracing.rs

@@ -54,7 +54,7 @@ use ruma::{
     MilliSecondsSinceUnixEpoch, OwnedUserId, RoomId, UInt, UserId,
 };
 use tokio::sync::RwLock;
-use tracing::{debug, info, trace, warn};
+use tracing::{debug, info, instrument, trace, warn};
 
 use crate::{
     deserialized_responses::{AmbiguityChanges, MembersResponse, SyncTimelineEvent},
@@ -297,6 +297,7 @@ impl BaseClient {
     }
 
     #[allow(clippy::too_many_arguments)]
+    #[instrument(skip_all, fields(room_id = ?room_info.room_id))]
     pub(crate) async fn handle_timeline(
         &self,
         room: &Room,
@@ -438,6 +439,7 @@ impl BaseClient {
         Ok(timeline)
     }
 
+    #[instrument(skip_all, fields(room_id = ?room_info.room_id))]
     pub(crate) fn handle_invited_state(
         &self,
         events: &[Raw<AnyStrippedStateEvent>],
@@ -467,6 +469,7 @@ impl BaseClient {
         changes.stripped_state.insert(room_info.room_id().to_owned(), state_events);
     }
 
+    #[instrument(skip_all, fields(room_id = ?room_info.room_id))]
     pub(crate) async fn handle_state(
         &self,
         events: &[Raw<AnySyncStateEvent>],
@@ -478,21 +481,19 @@ impl BaseClient {
         let mut user_ids = BTreeSet::new();
         let mut profiles = BTreeMap::new();
 
-        let room_id = room_info.room_id.clone();
-
         for raw_event in events {
             let event = match raw_event.deserialize() {
-                Ok(e) => e,
+                Ok(ev) => ev,
                 Err(e) => {
-                    warn!(?room_id, "Couldn't deserialize state event: {e:?}");
+                    warn!("Couldn't deserialize state event: {e}");
                     continue;
                 }
             };
 
             room_info.handle_state_event(&event);
 
             if let AnySyncStateEvent::RoomMember(member) = &event {
-                ambiguity_cache.handle_event(changes, &room_id, member).await?;
+                ambiguity_cache.handle_event(changes, &room_info.room_id, member).await?;
 
                 match member.membership() {
                     MembershipState::Join | MembershipState::Invite => {
@@ -516,12 +517,13 @@ impl BaseClient {
                 .insert(event.state_key().to_owned(), raw_event.clone());
         }
 
-        changes.profiles.insert((*room_id).to_owned(), profiles);
-        changes.state.insert((*room_id).to_owned(), state_events);
+        changes.profiles.insert((*room_info.room_id).to_owned(), profiles);
+        changes.state.insert((*room_info.room_id).to_owned(), state_events);
 
         Ok(user_ids)
     }
 
+    #[instrument(skip_all, fields(?room_id))]
     pub(crate) async fn handle_room_account_data(
         &self,
         room_id: &RoomId,
@@ -535,6 +537,7 @@ impl BaseClient {
         }
     }
 
+    #[instrument(skip_all)]
     pub(crate) async fn handle_account_data(
         &self,
         events: &[Raw<AnyGlobalAccountDataEvent>],
@@ -580,6 +583,7 @@ impl BaseClient {
     }
 
     #[cfg(feature = "e2e-encryption")]
+    #[instrument(skip_all)]
     pub(crate) async fn preprocess_to_device_events(
         &self,
         to_device_events: Vec<Raw<ruma::events::AnyToDeviceEvent>>,
@@ -656,6 +660,7 @@ impl BaseClient {
     /// # Arguments
     ///
     /// * `response` - The response that we received after a successful sync.
+    #[instrument(skip_all)]
     pub async fn receive_sync_response(
         &self,
         response: api::sync::sync_events::v3::Response,
@@ -720,13 +725,21 @@ impl BaseClient {
                 )
                 .await?;
 
-            if let Some(event) =
-                new_info.ephemeral.events.iter().find_map(|e| match e.deserialize() {
-                    Ok(AnySyncEphemeralRoomEvent::Receipt(event)) => Some(event.content),
-                    _ => None,
-                })
-            {
-                changes.add_receipts(&room_id, event);
+            for raw in &new_info.ephemeral.events {
+                match raw.deserialize() {
+                    Ok(AnySyncEphemeralRoomEvent::Receipt(event)) => {
+                        changes.add_receipts(&room_id, event.content);
+                    }
+                    Ok(_) => {}
+                    Err(e) => {
+                        let event_id: Option<String> = raw.get_field("event_id").ok().flatten();
+                        #[rustfmt::skip]
+                        info!(
+                            ?room_id, event_id,
+                            "Failed to deserialize ephemeral room event: {e}"
+                        );
+                    }
+                }
             }
 
             if new_info.timeline.limited {
@@ -907,6 +920,7 @@ impl BaseClient {
     /// * `room_id` - The room id this response belongs to.
     ///
     /// * `response` - The raw response that was received from the server.
+    #[instrument(skip_all, fields(?room_id))]
     pub async fn receive_members(
         &self,
         room_id: &RoomId,