Update Rust crate tokio to 1.49.0

.drone.yml

@@ -6,7 +6,7 @@ name: default
 steps:
   # Frontend
   - name: web_build
-    image: node:23
+    image: node:25
     volumes:
       - name: web_app
         path: /tmp/web_build

matrixgw_backend/Cargo.toml

@@ -6,34 +6,34 @@ edition = "2024"
 [dependencies]
 env_logger = "0.11.8"
 log = "0.4.29"
-clap = { version = "4.5.53", features = ["derive", "env"] }
+clap = { version = "4.5.56", features = ["derive", "env"] }
 lazy_static = "1.5.0"
 anyhow = "1.0.100"
 serde = { version = "1.0.228", features = ["derive"] }
-tokio = { version = "1.48.0", features = ["full"] }
+tokio = { version = "1.49.0", features = ["full"] }
 actix-web = "4.12.1"
 actix-session = { version = "0.11.0", features = ["redis-session"] }
 actix-remote-ip = "0.1.0"
 actix-cors = "0.7.1"
-light-openid = "1.0.4"
-bytes = "1.11.0"
+light-openid = "1.1.0"
+bytes = "1.11.1"
 sha2 = "0.10.9"
 base16ct = { version = "0.3.0", features = ["alloc"] }
 futures-util = "0.3.31"
-jwt-simple = { version = "0.12.13", default-features = false, features = ["pure-rust"] }
-thiserror = "2.0.17"
+jwt-simple = { version = "0.12.14", default-features = false, features = ["pure-rust"] }
+thiserror = "2.0.18"
 uuid = { version = "1.19.0", features = ["v4", "serde"] }
 ipnet = { version = "2.11.0", features = ["serde"] }
 rand = "0.9.2"
 hex = "0.4.3"
 mailchecker = "6.0.19"
-matrix-sdk = { version = "0.14.0" }
-matrix-sdk-ui = "0.14.0"
-url = "2.5.7"
-ractor = "0.15.9"
-serde_json = "1.0.145"
-lazy-regex = "3.4.2"
-actix-ws = "0.3.0"
+matrix-sdk = { version = "0.16.0", features = ["e2e-encryption"] }
+matrix-sdk-ui = "0.16.0"
+url = "2.5.8"
+ractor = "0.15.10"
+serde_json = "1.0.149"
+lazy-regex = "3.5.1"
+actix-ws = "0.3.1"
 infer = "0.19.0"
-rust-embed = "8.9.0"
+rust-embed = "8.11.0"
 mime_guess = "2.0.5"

matrixgw_backend/src/controllers/matrix/matrix_media_controller.rs

@@ -4,11 +4,9 @@ use crate::utils::crypt_utils::sha512;
 use actix_web::dev::Payload;
 use actix_web::http::header;
 use actix_web::{FromRequest, HttpRequest, HttpResponse, web};
-use matrix_sdk::crypto::{AttachmentDecryptor, MediaEncryptionInfo};
 use matrix_sdk::media::{MediaFormat, MediaRequestParameters, MediaThumbnailSettings};
 use matrix_sdk::ruma::events::room::MediaSource;
 use matrix_sdk::ruma::{OwnedMxcUri, UInt};
-use std::io::{Cursor, Read};
 
 #[derive(serde::Deserialize)]
 pub struct MediaMXCInPath {
@@ -54,21 +52,6 @@ pub async fn serve_media(req: HttpRequest, source: MediaSource, thumbnail: bool)
         )
         .await?;
 
-    // Decrypt file if needed
-    let media = if let MediaSource::Encrypted(file) = source {
-        let mut cursor = Cursor::new(media);
-        let mut decryptor =
-            AttachmentDecryptor::new(&mut cursor, MediaEncryptionInfo::from(*file))?;
-
-        let mut decrypted_data = Vec::new();
-
-        decryptor.read_to_end(&mut decrypted_data)?;
-
-        decrypted_data
-    } else {
-        media
-    };
-
     let digest = sha512(&media);
 
     let mime_type = infer::get(&media).map(|x| x.mime_type());

matrixgw_backend/src/controllers/matrix/matrix_space_controller.rs

@@ -11,7 +11,9 @@ pub async fn hierarchy(client: MatrixClientExtractor) -> HttpResult {
     let space_service = SpaceService::new(client.client.client);
     let mut hierarchy = HashMap::new();
     for space in spaces {
-        let rooms = space_service.space_room_list(space.room_id().to_owned());
+        let rooms = space_service
+            .space_room_list(space.room_id().to_owned())
+            .await;
         while !matches!(
             rooms.pagination_state(),
             SpaceRoomListPaginationState::Idle { end_reached: true }

matrixgw_frontend/package.json

@@ -13,36 +13,36 @@
     "@emotion/react": "^11.14.0",
     "@emotion/styled": "^11.14.1",
     "@fontsource/roboto": "^5.2.9",
-    "@mui/icons-material": "^7.3.6",
-    "@mui/material": "^7.3.6",
-    "@mui/x-data-grid": "^8.20.0",
-    "@mui/x-date-pickers": "^8.19.0",
-    "date-and-time": "^4.1.1",
+    "@mui/icons-material": "^7.3.7",
+    "@mui/material": "^7.3.7",
+    "@mui/x-data-grid": "^8.26.0",
+    "@mui/x-date-pickers": "^8.26.0",
+    "date-and-time": "^4.2.0",
     "dayjs": "^1.11.19",
-    "emoji-picker-react": "^4.16.1",
-    "is-cidr": "^6.0.1",
+    "emoji-picker-react": "^4.17.4",
+    "is-cidr": "^6.0.2",
     "qrcode.react": "^4.2.0",
-    "react": "^19.1.1",
-    "react-dom": "^19.1.1",
+    "react": "^19.2.4",
+    "react-dom": "^19.2.4",
     "react-favicon": "^2.0.7",
     "react-json-view-lite": "^2.5.0",
-    "react-router": "^7.10.0"
+    "react-router": "^7.13.0"
   },
   "devDependencies": {
-    "@eslint/js": "^9.39.1",
-    "@types/node": "^24.10.1",
-    "@types/react": "^19.2.7",
+    "@eslint/js": "^9.39.2",
+    "@types/node": "^25.1.0",
+    "@types/react": "^19.2.10",
     "@types/react-dom": "^19.2.3",
-    "@vitejs/plugin-react": "^5.1.1",
-    "eslint": "^9.39.1",
+    "@vitejs/plugin-react": "^5.1.3",
+    "eslint": "^9.39.2",
     "eslint-plugin-react-hooks": "^7.0.1",
-    "eslint-plugin-react-refresh": "^0.4.22",
+    "eslint-plugin-react-refresh": "^0.4.26",
     "globals": "^16.5.0",
     "typescript": "~5.9.3",
-    "typescript-eslint": "^8.48.1",
-    "vite": "npm:rolldown-vite@7.2.10"
+    "typescript-eslint": "^8.54.0",
+    "vite": "npm:rolldown-vite@7.3.1"
   },
   "overrides": {
-    "vite": "npm:rolldown-vite@7.2.10"
+    "vite": "npm:rolldown-vite@7.3.1"
   }
 }