Skip to content

Switch custom protocol handler to async #153

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 16, 2025
Merged

Switch custom protocol handler to async #153

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 14 additions & 9 deletions src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ use tao::{
window::WindowBuilder,
};
use tokio::{sync::mpsc::channel, task, time::Instant};
use wry::{WebViewBuilder, WebViewId};
use wry::{RequestAsyncResponder, WebViewBuilder, WebViewId};

use crate::auth::AuthMessage;

Expand All @@ -31,15 +31,20 @@ const ON_ERROR_REFRESH_TIME: Duration = Duration::from_secs(1);
const ITEM_LIST_REFRESH_TIME: Duration = Duration::from_secs(60 * 60);

fn protocol_handler(
_: WebViewId,
_: WebViewId<'_>,
request: wry::http::Request<Vec<u8>>,
) -> wry::http::Response<Cow<'static, [u8]>> {
responder: RequestAsyncResponder,
) {
let path = CACHE_DIRECTORY.join(&request.uri().path()[1..]);
let content = Cow::Owned(std::fs::read(path).unwrap());
wry::http::Response::builder()
.header(wry::http::header::CACHE_CONTROL, "no-store")
.body(content)
.unwrap()
task::spawn(async move {
let content = Cow::Owned(tokio::fs::read(path).await.unwrap());
responder.respond(
wry::http::Response::builder()
.header(wry::http::header::CACHE_CONTROL, "no-store")
.body(content)
.unwrap(),
)
});
}

static CACHE_DIRECTORY: LazyLock<PathBuf> =
Expand All @@ -66,7 +71,7 @@ fn main() -> Result<(), wry::Error> {
};

let builder = WebViewBuilder::new()
.with_custom_protocol("slideshow".to_string(), protocol_handler)
.with_asynchronous_custom_protocol("slideshow".to_string(), protocol_handler)
.with_ipc_handler(handler)
.with_accept_first_mouse(true);

Expand Down