magmaus3/continuwuity
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

use mutex_map for url preview lock

Browse source 
Signed-off-by: Jason Volk <jason@zemos.net>
This commit is contained in:
Jason Volk 2024-07-17 02:48:43 +00:00
parent b0ac5255c8
commit b116984e46
2 changed files with 10 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/api/client/media.rs
View file

@ -1,6 +1,6 @@
#![allow(deprecated)] #![allow(deprecated)]
use std::{io::Cursor, sync::Arc, time::Duration}; use std::{io::Cursor, time::Duration};
use axum::extract::State; use axum::extract::State;
use axum_client_ip::InsecureClientIp; use axum_client_ip::InsecureClientIp;
@ -656,16 +656,7 @@ async fn get_url_preview(services: &Services, url: &str) -> Result<UrlPreviewDat
} }
// ensure that only one request is made per URL // ensure that only one request is made per URL
let mutex_request = Arc::clone( let _request_lock = services.media.url_preview_mutex.lock(url).await;
services
.media
.url_preview_mutex
.write()
.await
.entry(url.to_owned())
.or_default(),
);
let _request_lock = mutex_request.lock().await;
match services.media.get_url_preview(url).await { match services.media.get_url_preview(url).await {
Some(preview) => Ok(preview), Some(preview) => Ok(preview),

13
src/service/media/mod.rs
View file

@ -2,18 +2,17 @@ mod data;
mod tests; mod tests;
mod thumbnail; mod thumbnail;
use std::{collections::HashMap, path::PathBuf, sync::Arc, time::SystemTime}; use std::{path::PathBuf, sync::Arc, time::SystemTime};
use async_trait::async_trait; use async_trait::async_trait;
use base64::{engine::general_purpose, Engine as _}; use base64::{engine::general_purpose, Engine as _};
use conduit::{debug, debug_error, err, error, utils, Err, Result, Server}; use conduit::{debug, debug_error, err, error, utils, utils::MutexMap, Err, Result, Server};
use data::{Data, Metadata}; use data::{Data, Metadata};
use ruma::{OwnedMxcUri, OwnedUserId}; use ruma::{OwnedMxcUri, OwnedUserId};
use serde::Serialize; use serde::Serialize;
use tokio::{ use tokio::{
fs, fs,
io::{AsyncReadExt, AsyncWriteExt, BufReader}, io::{AsyncReadExt, AsyncWriteExt, BufReader},
sync::{Mutex, RwLock},
}; };
use crate::services; use crate::services;
@ -44,7 +43,7 @@ pub struct UrlPreviewData {
pub struct Service { pub struct Service {
server: Arc<Server>, server: Arc<Server>,
pub(crate) db: Data, pub(crate) db: Data,
pub url_preview_mutex: RwLock<HashMap<String, Arc<Mutex<()>>>>, pub url_preview_mutex: MutexMap<String, ()>,
} }
#[async_trait] #[async_trait]
@ -53,7 +52,7 @@ impl crate::Service for Service {
Ok(Arc::new(Self { Ok(Arc::new(Self {
server: args.server.clone(), server: args.server.clone(),
db: Data::new(args.db), db: Data::new(args.db),
url_preview_mutex: RwLock::new(HashMap::new()), url_preview_mutex: MutexMap::new(),
})) }))
} }
@ -274,10 +273,12 @@ impl Service {
} }
#[inline] #[inline]
#[must_use]
pub fn get_media_file(&self, key: &[u8]) -> PathBuf { self.get_media_file_sha256(key) } pub fn get_media_file(&self, key: &[u8]) -> PathBuf { self.get_media_file_sha256(key) }
/// new SHA256 file name media function. requires database migrated. uses /// new SHA256 file name media function. requires database migrated. uses
/// SHA256 hash of the base64 key as the file name /// SHA256 hash of the base64 key as the file name
#[must_use]
pub fn get_media_file_sha256(&self, key: &[u8]) -> PathBuf { pub fn get_media_file_sha256(&self, key: &[u8]) -> PathBuf {
let mut r = self.get_media_dir(); let mut r = self.get_media_dir();
// Using the hash of the base64 key as the filename // Using the hash of the base64 key as the filename
@ -292,6 +293,7 @@ impl Service {
/// old base64 file name media function /// old base64 file name media function
/// This is the old version of `get_media_file` that uses the full base64 /// This is the old version of `get_media_file` that uses the full base64
/// key as the filename. /// key as the filename.
#[must_use]
pub fn get_media_file_b64(&self, key: &[u8]) -> PathBuf { pub fn get_media_file_b64(&self, key: &[u8]) -> PathBuf {
let mut r = self.get_media_dir(); let mut r = self.get_media_dir();
let encoded = encode_key(key); let encoded = encode_key(key);
@ -299,6 +301,7 @@ impl Service {
r r
} }
#[must_use]
pub fn get_media_dir(&self) -> PathBuf { pub fn get_media_dir(&self) -> PathBuf {
let mut r = PathBuf::new(); let mut r = PathBuf::new();
r.push(self.server.config.database_path.clone()); r.push(self.server.config.database_path.clone());