Cargo.lock

@@ -246,7 +246,6 @@ dependencies = [
  "actix-files",
  "actix-web",
  "adf_bdd",
- "derive_more",
  "env_logger 0.9.3",
  "log",
  "serde",

server/Cargo.toml

@@ -16,7 +16,6 @@ adf_bdd = { version="0.3.1", path="../lib", features = ["frontend"] }
 actix-web = "4"
 actix-cors = "0.6"
 actix-files = "0.6"
-derive_more = "0.99.17"
 env_logger = "0.9"
 log = "0.4"
 serde = "1"

server/src/main.rs

@@ -1,15 +1,11 @@
-use std::time::Duration;
-
 use actix_files as fs;
-use actix_web::rt::task::spawn_blocking;
-use actix_web::rt::time::timeout;
-use actix_web::{post, web, App, HttpServer, Responder, ResponseError};
+use actix_web::{post, web, App, HttpServer, Responder};
 use serde::{Deserialize, Serialize};
 
-use derive_more::{Display, Error};
-
 #[cfg(feature = "cors_for_local_development")]
 use actix_cors::Cors;
+#[cfg(feature = "cors_for_local_development")]
+use actix_web::http;
 
 use adf_bdd::adf::{Adf, DoubleLabeledGraph};
 use adf_bdd::adfbiodivine::Adf as BdAdf;
@@ -44,7 +40,8 @@ struct SolveResBody {
     graph: DoubleLabeledGraph,
 }
 
-fn solve(req_body: web::Json<SolveReqBody>) -> impl Responder {
+#[post("/solve")]
+async fn solve(req_body: web::Json<SolveReqBody>) -> impl Responder {
     let input = &req_body.code;
     let parsing = &req_body.parsing;
     let strategy = &req_body.strategy;
@@ -96,29 +93,6 @@ fn solve(req_body: web::Json<SolveReqBody>) -> impl Responder {
     web::Json(dto)
 }
 
-#[derive(Debug, Display, Error)]
-#[display(
-    fmt = "Endpoint {} timed out. Probably your ADF problem is too complicated :(",
-    endpoint
-)]
-struct Timeout {
-    endpoint: &'static str,
-}
-
-impl ResponseError for Timeout {}
-
-#[post("/solve")]
-async fn solve_with_timeout(req_body: web::Json<SolveReqBody>) -> impl Responder {
-    timeout(Duration::from_secs(20), spawn_blocking(|| solve(req_body)))
-        .await
-        .map(|ok| {
-            ok.expect(
-                "An error in the spawned solve thread occurred. Timeouts are handled separately.",
-            )
-        })
-        .map_err(|_| Timeout { endpoint: "/solve" })
-}
-
 #[actix_web::main]
 async fn main() -> std::io::Result<()> {
     env_logger::builder()
@@ -128,14 +102,18 @@ async fn main() -> std::io::Result<()> {
     #[cfg(feature = "cors_for_local_development")]
     let server = HttpServer::new(|| {
         let cors = Cors::default()
-            .allow_any_origin()
-            .allow_any_method()
-            .allow_any_header()
+            .allowed_origin("http://localhost:1234")
+            .allowed_methods(vec!["GET", "POST"])
+            .allowed_headers(vec![
+                http::header::AUTHORIZATION,
+                http::header::ACCEPT,
+                http::header::CONTENT_TYPE,
+            ])
             .max_age(3600);
 
         App::new()
             .wrap(cors)
-            .service(solve_with_timeout)
+            .service(solve)
             // this mus be last to not override anything
             .service(fs::Files::new("/", "./assets").index_file("index.html"))
     })
@@ -146,7 +124,7 @@ async fn main() -> std::io::Result<()> {
     #[cfg(not(feature = "cors_for_local_development"))]
     let server = HttpServer::new(|| {
         App::new()
-            .service(solve_with_timeout)
+            .service(solve)
             // this mus be last to not override anything
             .service(fs::Files::new("/", "./assets").index_file("index.html"))
     })