Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Update dependencies
  • Loading branch information
nazar-pc committed Jul 29, 2021
1 parent a055f06 commit 65287c2
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 24 deletions.
18 changes: 9 additions & 9 deletions rust/Cargo.toml
Expand Up @@ -23,29 +23,29 @@ targets = []
async-channel = "1.6.1"
async-executor = "1.4.1"
async-fs = "1.5.0"
async-io = "1.4.1"
async-io = "1.6.0"
async-lock = "2.4.0"
async-oneshot = "0.5.0"
async-trait = "0.1.50"
bytes = "1.0.1"
event-listener-primitives = "1.0.0"
fastrand = "1.4.1"
fastrand = "1.5.0"
futures-lite = "1.12.0"
h264-profile-level-id = "0.1.1"
log = "0.4.14"
libc = "0.2.97"
libc = "0.2.98"
once_cell = "1.8.0"
serde_json = "1.0.64"
serde_repr = "0.1.7"
thiserror = "1.0.25"
thiserror = "1.0.26"

[dependencies.lru]
default-features = false
version = "0.6.5"

[dependencies.mediasoup-sys]
path = "../worker"
version = "0.2.2"
version = "0.2.3"

[dependencies.parking_lot]
version = "0.11.1"
Expand All @@ -65,7 +65,7 @@ features = ["serde", "v4"]
version = "0.8.2"

[dev-dependencies]
actix = "0.10.0"
actix-web = "3.3.2"
actix-web-actors = "3.0.0"
env_logger = "0.8.4"
actix = "0.12.0"
actix-web = "4.0.0-beta.8"
actix-web-actors = "4.0.0-beta.6"
env_logger = "0.9.0"
12 changes: 6 additions & 6 deletions rust/examples-frontend/echo/package.json
Expand Up @@ -2,20 +2,20 @@
"version": "0.0.0",
"private": true,
"engines": {
"node": ">=14"
"node": ">=14.8"
},
"scripts": {
"start": "webpack serve"
},
"author": "Nazar Mokrynskyi <nazar@mokrynskyi.com>",
"dependencies": {
"mediasoup-client": "^3.6.30"
"mediasoup-client": "^3.6.36"
},
"devDependencies": {
"ts-loader": "^9.2.2",
"typescript": "^4.2.4",
"webpack": "^5.37.1",
"webpack-cli": "^4.7.0",
"ts-loader": "^9.2.4",
"typescript": "^4.3.5",
"webpack": "^5.46.0",
"webpack-cli": "^4.7.2",
"webpack-dev-server": "^3.11.2"
}
}
19 changes: 10 additions & 9 deletions rust/examples/echo.rs
Expand Up @@ -330,7 +330,7 @@ impl Handler<ClientMessage> for EchoServer {
);
}
}
})
});
}
}
}
Expand Down Expand Up @@ -369,23 +369,24 @@ async fn ws_index(
worker_manager: Data<WorkerManager>,
stream: Payload,
) -> Result<HttpResponse, Error> {
let echo_server = EchoServer::new(&worker_manager).await.map_err(|error| {
eprintln!("{}", error);
match EchoServer::new(&worker_manager).await {
Ok(echo_server) => ws::start(echo_server, &request, stream),
Err(error) => {
eprintln!("{}", error);

HttpResponse::InternalServerError().finish()
})?;

ws::start(echo_server, &request, stream)
Ok(HttpResponse::InternalServerError().finish())
}
}
}

#[actix_web::main]
async fn main() -> std::io::Result<()> {
env_logger::init();

let worker_manager = WorkerManager::new();
let worker_manager = Data::new(WorkerManager::new());
HttpServer::new(move || {
App::new()
.data(worker_manager.clone())
.app_data(worker_manager.clone())
.route("/ws", web::get().to(ws_index))
})
.workers(2)
Expand Down

0 comments on commit 65287c2

Please sign in to comment.