Merge branch 'main' into toger5/widget-driver-matrix-api-errors

Author: toger5

.deny.toml

@@ -10,6 +10,7 @@ exclude = [
 version = 2
 ignore = [
     { id = "RUSTSEC-2023-0071", reason = "We are not using RSA directly, nor do we depend on the RSA crate directly" },
+    { id = "RUSTSEC-2024-0384", reason = "Unmaintained backoff crate, not critical. We'll migrate soon." },
 ]
 
 [licenses]

.github/workflows/ci.yml

@@ -304,7 +304,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Check the spelling of the files in our repo
-        uses: crate-ci/[email protected].0
+        uses: crate-ci/[email protected].3
 
   clippy:
     name: Run clippy

.github/workflows/upload_coverage.yml

@@ -1,6 +1,6 @@
 # Copied with minimal adjustments, source:
 # https://github.com/google/mdbook-i18n-helpers/blob/2168b9cea1f4f76b55426591a9bcc308a620194f/.github/workflows/coverage-report.yml
-name: Codecov
+name: Upload code coverage
 
 on:
   # This workflow is triggered after every successful execution
@@ -64,7 +64,7 @@ jobs:
           path: repo_root
 
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v4
+        uses: codecov/codecov-action@v5
         with:
           token: ${{ secrets.CODECOV_UPLOAD_TOKEN }}
           fail_ci_if_error: true

ARCHITECTURE.md

@@ -76,7 +76,7 @@ implement encryption at rest can use those primitives.
 
 Very high-level primitives implementing the best practices and cutting-edge Matrix tech:
 
-- `EncryptionService`: a specialized service running simplified sliding sync (MSC4186) for
+- `EncryptionSyncService`: a specialized service running simplified sliding sync (MSC4186) for
   everything related to crypto and E2EE for the current `Client`.
 - `RoomListService`: a specialized service running simplified sliding sync (MSC4186) for
   retrieving the list of current rooms, and exposing its entries.

Cargo.lock

@@ -22,6 +22,7 @@ rust-version = "1.76"
 
 [workspace.dependencies]
 anyhow = "1.0.68"
+aquamarine = "0.6.0"
 assert-json-diff = "2"
 assert_matches = "1.5.0"
 assert_matches2 = "0.1.1"
@@ -32,8 +33,8 @@ as_variant = "1.2.0"
 base64 = "0.22.0"
 byteorder = "1.4.3"
 eyeball = { version = "0.8.8", features = ["tracing"] }
-eyeball-im = { version = "0.5.0", features = ["tracing"] }
-eyeball-im-util = "0.6.0"
+eyeball-im = { version = "0.5.1", features = ["tracing"] }
+eyeball-im-util = "0.7.0"
 futures-core = "0.3.28"
 futures-executor = "0.3.21"
 futures-util = "0.3.26"
@@ -79,17 +80,17 @@ vodozemac = { version = "0.8.0", features = ["insecure-pk-encryption"] }
 wiremock = "0.6.0"
 zeroize = "1.6.0"
 
-matrix-sdk = { path = "crates/matrix-sdk", version = "0.7.0", default-features = false }
-matrix-sdk-base = { path = "crates/matrix-sdk-base", version = "0.7.0" }
-matrix-sdk-common = { path = "crates/matrix-sdk-common", version = "0.7.0" }
-matrix-sdk-crypto = { path = "crates/matrix-sdk-crypto", version = "0.7.0" }
+matrix-sdk = { path = "crates/matrix-sdk", version = "0.8.0", default-features = false }
+matrix-sdk-base = { path = "crates/matrix-sdk-base", version = "0.8.0" }
+matrix-sdk-common = { path = "crates/matrix-sdk-common", version = "0.8.0" }
+matrix-sdk-crypto = { path = "crates/matrix-sdk-crypto", version = "0.8.0" }
 matrix-sdk-ffi-macros = { path = "bindings/matrix-sdk-ffi-macros", version = "0.7.0" }
-matrix-sdk-indexeddb = { path = "crates/matrix-sdk-indexeddb", version = "0.7.0", default-features = false }
-matrix-sdk-qrcode = { path = "crates/matrix-sdk-qrcode", version = "0.7.0" }
-matrix-sdk-sqlite = { path = "crates/matrix-sdk-sqlite", version = "0.7.0", default-features = false }
-matrix-sdk-store-encryption = { path = "crates/matrix-sdk-store-encryption", version = "0.7.0" }
+matrix-sdk-indexeddb = { path = "crates/matrix-sdk-indexeddb", version = "0.8.0", default-features = false }
+matrix-sdk-qrcode = { path = "crates/matrix-sdk-qrcode", version = "0.8.0" }
+matrix-sdk-sqlite = { path = "crates/matrix-sdk-sqlite", version = "0.8.0", default-features = false }
+matrix-sdk-store-encryption = { path = "crates/matrix-sdk-store-encryption", version = "0.8.0" }
 matrix-sdk-test = { path = "testing/matrix-sdk-test", version = "0.7.0" }
-matrix-sdk-ui = { path = "crates/matrix-sdk-ui", version = "0.7.0", default-features = false }
+matrix-sdk-ui = { path = "crates/matrix-sdk-ui", version = "0.8.0", default-features = false }
 
 # Default release profile, select with `--release`
 [profile.release]

Cargo.toml

@@ -2,15 +2,16 @@ use std::{sync::Arc, time::Duration};
 
 use criterion::{criterion_group, criterion_main, BenchmarkId, Criterion, Throughput};
 use matrix_sdk::{
-    config::SyncSettings,
-    test_utils::{events::EventFactory, logged_in_client_with_server},
-    utils::IntoRawStateEventContent,
+    config::SyncSettings, test_utils::logged_in_client_with_server, utils::IntoRawStateEventContent,
 };
 use matrix_sdk_base::{
     store::StoreConfig, BaseClient, RoomInfo, RoomState, SessionMeta, StateChanges, StateStore,
 };
 use matrix_sdk_sqlite::SqliteStateStore;
-use matrix_sdk_test::{EventBuilder, JoinedRoomBuilder, StateTestEvent, SyncResponseBuilder};
+use matrix_sdk_test::{
+    event_factory::EventFactory, EventBuilder, JoinedRoomBuilder, StateTestEvent,
+    SyncResponseBuilder,
+};
 use matrix_sdk_ui::{timeline::TimelineFocus, Timeline};
 use ruma::{
     api::client::membership::get_member_events,
@@ -74,7 +75,10 @@ pub fn receive_all_members_benchmark(c: &mut Criterion) {
         .block_on(sqlite_store.save_changes(&changes))
         .expect("initial filling of sqlite failed");
 
-    let base_client = BaseClient::with_store_config(StoreConfig::new().state_store(sqlite_store));
+    let base_client = BaseClient::with_store_config(
+        StoreConfig::new("cross-process-store-locks-holder-name".to_owned())
+            .state_store(sqlite_store),
+    );
 
     runtime
         .block_on(base_client.set_session_meta(

benchmarks/benches/room_bench.rs

@@ -69,7 +69,10 @@ pub fn restore_session(c: &mut Criterion) {
         b.to_async(&runtime).iter(|| async {
             let client = Client::builder()
                 .homeserver_url("https://matrix.example.com")
-                .store_config(StoreConfig::new().state_store(store.clone()))
+                .store_config(
+                    StoreConfig::new("cross-process-store-locks-holder-name".to_owned())
+                        .state_store(store.clone()),
+                )
                 .build()
                 .await
                 .expect("Can't build client");
@@ -96,7 +99,10 @@ pub fn restore_session(c: &mut Criterion) {
                 b.to_async(&runtime).iter(|| async {
                     let client = Client::builder()
                         .homeserver_url("https://matrix.example.com")
-                        .store_config(StoreConfig::new().state_store(store.clone()))
+                        .store_config(
+                            StoreConfig::new("cross-process-store-locks-holder-name".to_owned())
+                                .state_store(store.clone()),
+                        )
                         .build()
                         .await
                         .expect("Can't build client");

benchmarks/benches/store_bench.rs

@@ -13,6 +13,7 @@ let package = Package(
     ],
     products: [
         .library(name: "MatrixRustSDK",
+                 type: .dynamic,
                  targets: ["MatrixRustSDK"]),
     ],
     targets: [

bindings/apple/Debug-Package.swift

@@ -13,10 +13,3 @@ interface RoomMessageEventContentWithoutRelation {
 interface ClientError {
     Generic(string msg);
 };
-
-interface MediaSource {
-    [Name=from_json, Throws=ClientError]
-    constructor(string json);
-    string to_json();
-    string url();
-};