mercuryworkshop-mirror/epoxy-tls
1
0
Fork 0
mirror of https://github.com/MercuryWorkshop/epoxy-tls.git synced 2025-05-13 06:20:02 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix chrome

Browse source
This commit is contained in:
Toshit Chawda 2024-01-06 23:01:40 -08:00
parent 87a633d37a
commit ed7c5dc5e1
No known key found for this signature in database
GPG key ID: 91480ED99E2B3D9D
1 changed files with 23 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/main.rs
View file

@ -4,7 +4,8 @@ use bytes::Bytes;
use fastwebsockets::{upgrade, FragmentCollector, Frame, OpCode, Payload, WebSocketError}; use fastwebsockets::{upgrade, FragmentCollector, Frame, OpCode, Payload, WebSocketError};
use futures_util::{SinkExt, StreamExt}; use futures_util::{SinkExt, StreamExt};
use hyper::{ use hyper::{
body::Incoming, server::conn::http1, service::service_fn, Request, Response, StatusCode, body::Incoming, header::HeaderValue, server::conn::http1, service::service_fn, Request,
Response, StatusCode,
}; };
use hyper_util::rt::TokioIo; use hyper_util::rt::TokioIo;
use tokio::net::{TcpListener, TcpStream}; use tokio::net::{TcpListener, TcpStream};
@ -35,18 +36,34 @@ async fn main() -> Result<(), Error> {
Ok(()) Ok(())
} }
async fn accept_http(mut req: Request<Incoming>, addr: String) -> Result<Response<HttpBody>, WebSocketError> { async fn accept_http(
mut req: Request<Incoming>,
addr: String,
) -> Result<Response<HttpBody>, WebSocketError> {
if upgrade::is_upgrade_request(&req) { if upgrade::is_upgrade_request(&req) {
let uri = req.uri().clone(); let uri = req.uri().clone();
let (res, fut) = upgrade::upgrade(&mut req)?; let (mut res, fut) = upgrade::upgrade(&mut req)?;
tokio::spawn(async move { tokio::spawn(async move {
if let Err(e) = accept_ws(fut, uri.path().to_string(), addr.clone()).await if let Err(e) = accept_ws(fut, uri.path().to_string(), addr.clone()).await {
{
println!("{:?}: error in ws: {:?}", addr, e); println!("{:?}: error in ws: {:?}", addr, e);
} }
}); });
if let Some(protocol) = req.headers().get("Sec-Websocket-Protocol") {
let first_protocol = protocol
.to_str()
.expect("failed to get protocol")
.split(',')
.next()
.expect("failed to get first protocol")
.trim();
res.headers_mut().insert(
"Sec-Websocket-Protocol",
HeaderValue::from_str(first_protocol).unwrap(),
);
}
Ok(res) Ok(res)
} else { } else {
Ok(Response::builder() Ok(Response::builder()
@ -59,7 +76,7 @@ async fn accept_http(mut req: Request<Incoming>, addr: String) -> Result<Respons
async fn accept_ws( async fn accept_ws(
fut: upgrade::UpgradeFut, fut: upgrade::UpgradeFut,
incoming_uri: String, incoming_uri: String,
addr: String addr: String,
) -> Result<(), Box<dyn std::error::Error>> { ) -> Result<(), Box<dyn std::error::Error>> {
let mut ws_stream = FragmentCollector::new(fut.await?); let mut ws_stream = FragmentCollector::new(fut.await?);