starred/windmill
1
0
Fork 0
mirror of https://github.com/windmill-labs/windmill.git synced 2026-09-10 08:07:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

small nit BASE_URL

Browse Source
This commit is contained in:
Ruben Fiszel
2024-07-28 10:25:33 +02:00
parent 7099ec48e6
commit 35d567e2e0
5 changed files with 102 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/windmill-common/src/worker.rs
+3 -1
View File
@@ -156,6 +156,7 @@ fn parse_file<T: FromStr>(path: &str) -> Option<T> {
pub struct Annotations {
pub npm_mode: bool,
pub nodejs_mode: bool,
pub native_mode: bool,
}
pub fn get_annotation(inner_content: &str) -> Annotations {
@@ -166,8 +167,9 @@ pub fn get_annotation(inner_content: &str) -> Annotations {
.collect_vec();
let nodejs_mode: bool = annotations.contains(&"nodejs".to_string());
let npm_mode: bool = annotations.contains(&"npm".to_string());
let native_mode: bool = annotations.contains(&"native".to_string());
Annotations { npm_mode, nodejs_mode }
Annotations { npm_mode, nodejs_mode, native_mode }
}
pub async fn load_cache(bin_path: &str, _remote_path: &str) -> (bool, String) {
backend/windmill-worker/src/bun_executor.rs
+85 -26
View File
@@ -1,4 +1,4 @@
use std::{collections::HashMap, fs, io, path::Path, process::Stdio};
use std::{collections::HashMap, fs, io, path::Path, process::Stdio, time::Instant};
use base64::Engine;
use itertools::Itertools;
@@ -71,6 +71,8 @@ pub async fn gen_lockfile(
let common_bun_proc_envs: HashMap<String, String> =
get_common_bun_proc_envs(&base_internal_url).await;
let mut empty_deps = false;
if let Some(raw_deps) = raw_deps {
gen_bunfig(job_dir).await?;
write_file(job_dir, "package.json", raw_deps.as_str()).await?;
@@ -123,20 +125,30 @@ pub async fn gen_lockfile(
false,
)
.await?;
let new_package_json = read_file_content(&format!("{job_dir}/package.json")).await?;
empty_deps = new_package_json
== r#"{
"dependencies": {}
}"#;
}
install_lockfile(
mem_peak,
canceled_by,
job_id,
w_id,
db,
job_dir,
worker_name,
common_bun_proc_envs,
npm_mode,
)
.await?;
if !empty_deps {
install_lockfile(
mem_peak,
canceled_by,
job_id,
w_id,
db,
job_dir,
worker_name,
common_bun_proc_envs,
npm_mode,
)
.await?;
} else {
append_logs(job_id, w_id, "\nempty dependencies, skipping install", db).await;
}
if export_pkg {
let mut content = "".to_string();
@@ -148,7 +160,7 @@ pub async fn gen_lockfile(
content.push_str(BUN_LOCKB_SPLIT);
{
let file = format!("{job_dir}/bun.lockb");
if tokio::fs::metadata(&file).await.is_ok() {
if !empty_deps && tokio::fs::metadata(&file).await.is_ok() {
let mut file = File::open(&file).await?;
let mut buf = vec![];
file.read_to_end(&mut buf).await?;
@@ -790,7 +802,9 @@ pub async fn handle_bun_job(
// }
}
let mut init_logs = if bundle_cache {
let mut init_logs = if annotation.native_mode {
"\n\n--- NATIVE CODE EXECUTION ---\n".to_string()
} else if bundle_cache {
if annotation.nodejs_mode {
"\n\n--- NODE BUNDLE SNAPSHOT EXECUTION ---\n".to_string()
} else {
@@ -798,6 +812,8 @@ pub async fn handle_bun_job(
}
} else if codebase.is_some() {
"\n\n--- NODE CODEBASE SNAPSHOT EXECUTION ---\n".to_string()
} else if annotation.native_mode {
"\n\n--- NATIVE CODE EXECUTION ---\n".to_string()
} else if annotation.nodejs_mode {
write_file(job_dir, "main.ts", &remove_pinned_imports(inner_content)?).await?;
"\n\n--- NODE CODE EXECUTION ---\n".to_string()
@@ -898,7 +914,9 @@ try {{
Ok(reserved_variables) as error::Result<HashMap<String, String>>
};
let build_cache = !bundle_cache && !codebase.is_some() && requirements_o.is_some();
let build_cache = !bundle_cache
&& !codebase.is_some()
&& (requirements_o.is_some() || annotation.native_mode);
let write_loader_f = async {
if build_cache {
@@ -955,16 +973,19 @@ try {{
&common_bun_proc_envs,
)
.await?;
match save_cache(&local_path, &remote_path, &format!("{job_dir}/main.js")).await {
Err(e) => {
let em = format!("could not save {local_path} to go cache: {e:?}");
tracing::error!(em)
}
Ok(logs) => {
init_logs.push_str(&"\n");
init_logs.push_str(&logs);
init_logs.push_str(&"\n");
tracing::info!("saved bun bundle cache: {logs}")
if !local_path.is_empty() {
match save_cache(&local_path, &remote_path, &format!("{job_dir}/main.js")).await {
Err(e) => {
let em = format!("could not save {local_path} to bundle cache: {e:?}");
tracing::error!(em)
}
Ok(logs) => {
init_logs.push_str(&"\n");
init_logs.push_str(&logs);
init_logs.push_str(&"\n");
tracing::info!("saved bun bundle cache: {logs}")
}
}
}
let ex_wrapper = read_file_content(&format!("{job_dir}/wrapper.mjs")).await?;
@@ -995,6 +1016,44 @@ try {{
.await?;
}
}
if annotation.native_mode {
let env_code = format!(
"const process = {{ env: {{}} }};\nconst BASE_URL = '{base_internal_url}';\nconst BASE_INTERNAL_URL = '{base_internal_url}';\nprocess.env['BASE_URL'] = BASE_URL;process.env['BASE_INTERNAL_URL'] = BASE_INTERNAL_URL;\n{}",
reserved_variables
.iter()
.map(|(k, v)| format!("process.env['{}'] = '{}';\n", k, v))
.collect::<Vec<String>>()
.join("\n"));
let js_code = read_file_content(&format!("{job_dir}/main.js")).await?;
let started_at = Instant::now();
let result = crate::js_eval::eval_fetch_timeout(
env_code,
inner_content.clone(),
js_code,
job.args.as_ref(),
job.id,
job.timeout,
db,
mem_peak,
canceled_by,
worker_name,
&job.workspace_id,
false,
)
.await?;
tracing::info!(
"Executed native code in {}ms",
started_at.elapsed().as_millis()
);
append_logs(
&job.id,
&job.workspace_id,
format!("{}\n{}", init_logs, result.1),
db,
)
.await;
return Ok(result.0);
}
append_logs(&job.id, &job.workspace_id, init_logs, db).await;
//do not cache local dependencies
backend/windmill-worker/src/js_eval.rs
+12 -8
View File
@@ -638,6 +638,7 @@ pub async fn eval_fetch_timeout(
canceled_by: &mut Option<CanceledBy>,
worker_name: &str,
w_id: &str,
load_client: bool,
) -> anyhow::Result<(Box<RawValue>, String)> {
let (sender, mut receiver) = oneshot::channel::<IsolateHandle>();
@@ -732,7 +733,7 @@ pub async fn eval_fetch_timeout(
let future = async {
tokio::select! {
r = eval_fetch(&mut js_runtime, &js_expr, Some(env_code)) => Ok(r),
r = eval_fetch(&mut js_runtime, &js_expr, Some(env_code), load_client) => Ok(r),
_ = memory_limit_rx.recv() => Err(Error::ExecutionErr("Memory limit reached, killing isolate".to_string()))
}
};
@@ -779,14 +780,17 @@ async fn eval_fetch(
js_runtime: &mut JsRuntime,
expr: &str,
env_code: Option<String>,
load_client: bool,
) -> anyhow::Result<Box<RawValue>> {
if let Some(env_code) = env_code.as_ref() {
let _ = js_runtime
.load_side_es_module_from_code(
&deno_core::resolve_url("file:///windmill.ts")?,
format!("{env_code}\n{}", WINDMILL_CLIENT.to_string()),
)
.await?;
if load_client {
if let Some(env_code) = env_code.as_ref() {
let _ = js_runtime
.load_side_es_module_from_code(
&deno_core::resolve_url("file:///windmill.ts")?,
format!("{env_code}\n{}", WINDMILL_CLIENT.to_string()),
)
.await?;
}
}
let _ = js_runtime
backend/windmill-worker/src/worker.rs
+1
View File
@@ -2339,6 +2339,7 @@ async fn do_nativets(
canceled_by,
worker_name,
&job.workspace_id,
true,
)
.await?;
Ok((result.0, result.1))
frontend/src/lib/components/FlowMetadata.svelte
+1 -1
View File
@@ -87,7 +87,7 @@
{/if}
{#if (job && job.job_kind == 'flow') || job?.job_kind == 'script'}
{@const stem = `/${job?.job_kind}s`}
{@const stem = `${job?.job_kind}s`}
{@const isScript = job?.job_kind === 'script'}
{@const viewHref = `${base}/${stem}/get/${isScript ? job?.script_hash : job?.script_path}`}
<div class="flex flex-row gap-2 items-center">