From 8b40001f2ae776473eaefcfbcc01a1768aff6cbe Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@rubenfiszel.com>
Date: Fri, 14 Jul 2023 10:51:42 +0200
Subject: [PATCH] fix: fix REST job potential double execution

---
 backend/windmill-api/src/jobs.rs       | 27 +++++++++++++++++++++-----
 backend/windmill-worker/src/js_eval.rs | 14 +++----------
 2 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/backend/windmill-api/src/jobs.rs b/backend/windmill-api/src/jobs.rs
index 0da647d0bd..7ef4b5c603 100644
--- a/backend/windmill-api/src/jobs.rs
+++ b/backend/windmill-api/src/jobs.rs
@@ -265,7 +265,12 @@ pub async fn get_path_tag_and_limits_for_hash<'c>(
             "querying getting path for hash {hash} in {w_id}: {e}"
         ))
     })?;
-    Ok((script.path, script.tag, script.concurrent_limit, script.concurrency_time_window_s))
+    Ok((
+        script.path,
+        script.tag,
+        script.concurrent_limit,
+        script.concurrency_time_window_s,
+    ))
 }
 
 async fn get_job(
@@ -1832,7 +1837,8 @@ pub async fn run_wait_result_script_by_hash(
 
     let hash = script_hash.0;
     let mut tx: QueueTransaction<'_, _> = (rsmq, user_db.clone().begin(&authed).await?).into();
-    let (path, tag, concurrent_limit, concurrency_time_window_s) = get_path_tag_and_limits_for_hash(tx.transaction_mut(), &w_id, hash).await?;
+    let (path, tag, concurrent_limit, concurrency_time_window_s) =
+        get_path_tag_and_limits_for_hash(tx.transaction_mut(), &w_id, hash).await?;
     check_scopes(&authed, || format!("run:script/{path}"))?;
 
     let args = run_query.add_include_headers(headers, args.unwrap_or_default());
@@ -1841,7 +1847,12 @@ pub async fn run_wait_result_script_by_hash(
     let (uuid, tx) = push(
         tx,
         &w_id,
-        JobPayload::ScriptHash { hash: ScriptHash(hash), path: path, concurrent_limit: concurrent_limit, concurrency_time_window_s: concurrency_time_window_s},
+        JobPayload::ScriptHash {
+            hash: ScriptHash(hash),
+            path: path,
+            concurrent_limit: concurrent_limit,
+            concurrency_time_window_s: concurrency_time_window_s,
+        },
         args,
         &authed.username,
         &authed.email,
@@ -2104,7 +2115,8 @@ pub async fn run_job_by_hash(
 ) -> error::Result<(StatusCode, String)> {
     let hash = script_hash.0;
     let mut tx: QueueTransaction<'_, _> = (rsmq, user_db.begin(&authed).await?).into();
-    let (path, tag, concurrent_limit, concurrency_time_window_s) = get_path_tag_and_limits_for_hash(tx.transaction_mut(), &w_id, hash).await?;
+    let (path, tag, concurrent_limit, concurrency_time_window_s) =
+        get_path_tag_and_limits_for_hash(tx.transaction_mut(), &w_id, hash).await?;
     check_scopes(&authed, || format!("run:script/{path}"))?;
 
     let scheduled_for = run_query.get_scheduled_for(tx.transaction_mut()).await?;
@@ -2114,7 +2126,12 @@ pub async fn run_job_by_hash(
     let (uuid, tx) = push(
         tx,
         &w_id,
-        JobPayload::ScriptHash { hash: ScriptHash(hash), path: path, concurrent_limit: concurrent_limit, concurrency_time_window_s: concurrency_time_window_s },
+        JobPayload::ScriptHash {
+            hash: ScriptHash(hash),
+            path: path,
+            concurrent_limit: concurrent_limit,
+            concurrency_time_window_s: concurrency_time_window_s,
+        },
         args,
         &authed.username,
         &authed.email,
diff --git a/backend/windmill-worker/src/js_eval.rs b/backend/windmill-worker/src/js_eval.rs
index 222305d12c..0a3fa491b1 100644
--- a/backend/windmill-worker/src/js_eval.rs
+++ b/backend/windmill-worker/src/js_eval.rs
@@ -505,20 +505,12 @@ pub async fn eval_fetch_timeout(
 }
 
 async fn eval_fetch(js_runtime: &mut JsRuntime, expr: &str) -> anyhow::Result<serde_json::Value> {
-    let code = format!(
-        r#"
-{expr}
-main()
-        "#
-    );
-
-    let mod_id = js_runtime
-        .load_main_module(
+    let _ = js_runtime
+        .load_side_module(
             &deno_core::resolve_url("file:///eval.ts")?,
-            Some(code.into()),
+            Some(expr.to_string().into()),
         )
         .await?;
-    let _ = js_runtime.mod_evaluate(mod_id);
 
     let global = js_runtime.execute_script(
         "<anon>",