* feat: add script module mode with folder model for Bun and Python Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * fix: add missing modules field to RawCode in bun_executor Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * sqlx * feat: enrich WAC templates with checkpoint and replay semantics Add prominent comments explaining that all computation must happen inside task/step/taskScript or it will be replayed on resume/retry. Clarify that waitForApproval does not hold a worker and that approve/reject URLs are available in the timeline step details. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * fix(cli): script module sync idempotency, per-module hash tracking, and preview support - Fix pull→push idempotency: use `??` instead of `||` for module lock field so empty strings are preserved (matches API's `lock: ""`) - Add per-module hash tracking in wmill-lock.yaml following the flow inline script pattern (SCRIPT_TOP_HASH + per-module subpath hashes) - Selective module lock regeneration: only regenerate locks for modules whose content actually changed, not all modules - Use unfiltered rawWorkspaceDependencies for module hashes to match what updateModuleLocks passes to fetchScriptLock - Show changed module names in stale script output for clarity - Add module support to `script preview` command: read modules from __mod/ folder and pass them in the preview API request - Add preview tests for taskScript pattern (flat and folder layout) - Update test assertion for module stale detection output Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * feat(frontend): WAC UI improvements — reorder templates, module tab rename, import consolidation - Reorder WAC template buttons: TypeScript before Python in ScriptBuilder, CreateActionsScript, and CreateActionsFlow - Remove dropdown items from +Script button (simplify to direct link) - Move "Import Workflow-as-Code" to +Flow dropdown with dedicated drawer - Add module tab rename: pencil icon on hover opens popover with validation, fixed-width icon container prevents layout shift Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * feat: remaining module-mode changes from working branch - Backend parser updates for WAC detection - CLI sync/types updates for raw app path and module support - Frontend UI polish (Dev.svelte, ScriptRow, script hash page) - Test fixture updates Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * test(cli): add test for module modification detection in generate-metadata Verifies that modifying a single module file re-triggers stale detection and only the changed module is listed, not all modules. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix(backend): critical fixes from PR review - Fix hardcoded dev path in bun_executor.rs WAC v2 wrapper — use "windmill-client" import instead of absolute filesystem path - Fix missed no_main_func → auto_kind rename in parser TS test - Add modules column to clone_script SQL (windmill-common and windmill-api-workspaces) so cloned scripts retain their modules - Add modules: None to RawCode structs in worker tests - Restore complete sqlx cache (merge main's cache + our new queries) Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix(backend): fix clone warning treated as error in CI Change `.clone()` on double reference to `*k` dereference in scripts.rs hash implementation. Update sqlx cache with new query hashes from modified clone_script SQL. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix(frontend): use published parser wasm versions for CI build The local file:// paths for windmill-parser-wasm-py and windmill-parser-wasm-ts don't exist in the Cloudflare Pages build environment. Revert to published npm versions (1.655.0). Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix(frontend): update parser wasm packages to 1.657.2 Use newly published windmill-parser-wasm-ts and windmill-parser-wasm-py v1.657.2 which include auto_kind/WAC detection changes. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix(frontend): regenerate package-lock.json for npm ci compatibility Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix(frontend): use main's lockfile as base, update only parser wasm packages Regenerating package-lock.json from scratch pulled different dependency versions causing svelte-check type errors. Instead, start from main's lockfile and only update the two changed packages. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix(backend): add modules column to fetch_script_for_update query The Script<SR> struct has a modules field (FromRow), but fetch_script_for_update didn't SELECT modules, causing a runtime error "no column found for name: modules" when the worker processed dependency jobs. This was the root cause of the relock_skip test timeout. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix(backend): fix script module execution for Python and Bun - Fix modules not passed through job queue: inject _MODULES into PushArgs.extra when pushing Code jobs so worker can extract them - Fix Python module imports: use relative imports (from .helper) and add sys.path.insert for module directory in wrapper - Fix Python tests: use relative imports and empty lock to prevent pip from resolving module names as packages - Add local file check in Bun loader for module resolution - Ignore Bun module test (bundle mode loader integration tracked separately) - Add missing modules column to fetch_script_for_update query Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix(backend): remove unnecessary empty lock in Python module tests Relative imports (from .helper) are not parsed as pip packages, so the empty lock workaround is not needed. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix(backend): fix module execution for Python and Bun — all tests pass Python modules: - Use relative imports (from .helper import greet) since scripts run as packages - Add sys.path.insert for module directory in wrapper to ensure local modules take precedence over pip packages with same name Bun modules: - Use bundled output (./out/main.js) as wrapper import when modules are present — the bundled output has module content inlined by Bun.build, avoiding runtime loader resolution issues - Add local file check in loader.bun.js onResolve to short-circuit API URL resolution for module files on disk Job queue: - Inject _MODULES into PushArgs.extra when pushing Code jobs so the worker can extract them at execution time Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * refactor: address PR review — simplify, fix correctness, remove dead code Critical fixes: - Replace all CLI `no_main_func` references with `auto_kind` (string) to match the backend migration and API changes - Remove duplicated `compute_python_module_dir` in worker.rs, use the canonical version from python_executor.rs High priority: - Auto-create `__init__.py` in intermediate directories for nested Python modules so imports like `from .utils.math import add` work without users manually creating __init__.py files - Remove redundant `sys_path_insert` — relative imports use Python's package system, not sys.path Medium: - Fix lock file base name extraction: use regex to strip only the final extension (`.replace(/\.[^.]+$/, '')`) instead of `indexOf(".")` which breaks for files like `helper.test.ts` Simplification: - Remove dead `{#if false}` Popover block in ScriptEditor.svelte - Guard loader.bun.js local file check to only run for relative paths (matching the Windows loader pattern) - Add clarifying comment on Bun dual mechanism (build + run phases) - Add maintenance comment on manual Hash impl for NewScript Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: final review fixes — stale cleanup, baseName, auto_kind export - Fix sync.ts baseName extraction using indexOf(".") → regex (same fix as script.ts/metadata.ts, missed this instance) - Add stale module file cleanup in writeModulesToDisk: removes files from __mod/ that are no longer in the modules map before writing, fixing the pull→push cycle that couldn't delete modules - Log warning when _MODULES serialization fails in job push instead of silently dropping modules - Use strict equality (===) for auto_kind comparison - Exclude auto_kind from workspace export — it is auto-detected by the parser at deploy time from script content Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix(cli): remove auto_kind from push, comparison, and metadata auto_kind is auto-detected by the parser at deploy time, so the CLI should not send it, compare it, or write it to script.yaml. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: remove erroneously added backend/backend/.sqlx directory Duplicate .sqlx cache was committed at the wrong nested path. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: address PR review feedback + fix CI dead_code warning Frontend (ScriptEditor.svelte): - Fix switchToMain() missing lastSyncedCode update — prevents stale code sync on external changes while editing a module tab - Fix formatAction saving module code to main script's localStorage draft — now saves main code when on a module tab - Fix non-null assertion on inferModuleLang in renameModule — fall back to original language instead of force unwrap - Remove redundant activeModuleTab truthy check in runTest CLI (script.ts): - Clean up empty directories after removing stale module files in writeModulesToDisk Backend: - Add path traversal guard in write_module_files — reject module paths containing ".." - Fix dead_code warning on auto_kind field in workspace export struct Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * feat(frontend): improve auto_kind UX + address review findings - Rename "Include without main function" toggle to "Include library scripts" in script list (ItemsList.svelte) - Update NoMainFuncBadge: "No main" → "Library" with clearer tooltip - Filter module file extensions by main script language — Python scripts only allow .py modules, TypeScript only .ts, etc. - Split flushModuleState into flushModuleContent (no UI side-effect) and flushModuleState (flush + reset tab), reducing duplication - Dynamic placeholder and hint text in add module popover based on main script language Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>
268 lines
7.8 KiB
Rust
268 lines
7.8 KiB
Rust
/*
|
|
* Integration tests for nativets (//native) job execution.
|
|
*
|
|
* These tests ensure that the V8 runtime is properly initialized and that
|
|
* nativets jobs execute correctly without segfaults. They cover sync functions,
|
|
* async functions, and fetch operations.
|
|
*
|
|
* All nativets tests run inside a single #[sqlx::test] with a single long-lived
|
|
* worker, because V8 isolates cannot be safely created/destroyed/recreated
|
|
* across different tokio runtimes or worker lifecycles.
|
|
*
|
|
* Run with:
|
|
* cargo test -p windmill --features "deno_core" --test nativets_jobs -- --nocapture
|
|
*/
|
|
|
|
#[cfg(feature = "deno_core")]
|
|
use windmill_test_utils::*;
|
|
|
|
#[cfg(feature = "deno_core")]
|
|
use futures::StreamExt;
|
|
#[cfg(feature = "deno_core")]
|
|
use sqlx::{Pool, Postgres};
|
|
#[cfg(feature = "deno_core")]
|
|
use windmill_common::jobs::{JobPayload, RawCode};
|
|
#[cfg(feature = "deno_core")]
|
|
use windmill_common::scripts::ScriptLang;
|
|
|
|
#[cfg(feature = "deno_core")]
|
|
fn nativets_code(content: &str) -> JobPayload {
|
|
JobPayload::Code(RawCode {
|
|
hash: None,
|
|
content: content.to_string(),
|
|
path: None,
|
|
language: ScriptLang::Bun,
|
|
lock: None,
|
|
concurrency_settings: windmill_common::runnable_settings::ConcurrencySettings::default()
|
|
.into(),
|
|
debouncing_settings: windmill_common::runnable_settings::DebouncingSettings::default(),
|
|
cache_ttl: None,
|
|
cache_ignore_s3_path: None,
|
|
dedicated_worker: None,
|
|
modules: None,
|
|
})
|
|
}
|
|
|
|
#[cfg(feature = "deno_core")]
|
|
async fn push_and_wait(
|
|
db: &Pool<Postgres>,
|
|
job: RunJob,
|
|
listener: &mut (impl StreamExt<Item = uuid::Uuid> + Unpin),
|
|
) -> CompletedJob {
|
|
let uuid = job.push(db).await;
|
|
let deadline = std::time::Instant::now() + tokio::time::Duration::from_secs(60);
|
|
loop {
|
|
let remaining = deadline.saturating_duration_since(std::time::Instant::now());
|
|
if remaining.is_zero() {
|
|
panic!("Timed out waiting for job {uuid}");
|
|
}
|
|
match tokio::time::timeout(remaining, listener.next()).await {
|
|
Ok(Some(completed_uuid)) if completed_uuid == uuid => break,
|
|
Ok(Some(_)) => continue,
|
|
Ok(None) => panic!("Listener ended while waiting for {uuid}"),
|
|
Err(_) => panic!("Timed out waiting for job {uuid}"),
|
|
}
|
|
}
|
|
completed_job(uuid, db).await
|
|
}
|
|
|
|
/// All nativets tests share a single worker to avoid V8 isolate lifecycle issues.
|
|
#[cfg(feature = "deno_core")]
|
|
#[sqlx::test(fixtures("base"))]
|
|
async fn test_nativets_jobs(db: Pool<Postgres>) -> anyhow::Result<()> {
|
|
initialize_tracing().await;
|
|
set_jwt_secret().await;
|
|
|
|
let server = ApiServer::start(db.clone()).await?;
|
|
let port = server.addr.port();
|
|
|
|
let mut listener = listen_for_completed_jobs(&db).await;
|
|
let conn = windmill_common::worker::Connection::Sql(db.clone());
|
|
let (killpill, _worker_handle) = spawn_test_worker(&conn, port);
|
|
|
|
// -- simple string return --
|
|
{
|
|
let result = push_and_wait(
|
|
&db,
|
|
RunJob::from(nativets_code(
|
|
r#"//native
|
|
|
|
export function main(): string {
|
|
return "hello from nativets";
|
|
}
|
|
"#,
|
|
)),
|
|
&mut listener,
|
|
)
|
|
.await;
|
|
assert!(result.success, "simple_return failed: {:?}", result.result);
|
|
assert_eq!(
|
|
result.json_result().unwrap(),
|
|
serde_json::json!("hello from nativets")
|
|
);
|
|
}
|
|
|
|
// -- arithmetic with args --
|
|
{
|
|
let result = push_and_wait(
|
|
&db,
|
|
RunJob::from(nativets_code(
|
|
r#"//native
|
|
|
|
export function main(x: number, y: number): number {
|
|
return x + y;
|
|
}
|
|
"#,
|
|
))
|
|
.arg("x", serde_json::json!(17))
|
|
.arg("y", serde_json::json!(25)),
|
|
&mut listener,
|
|
)
|
|
.await;
|
|
assert!(result.success, "with_args failed: {:?}", result.result);
|
|
assert_eq!(result.json_result().unwrap(), serde_json::json!(42));
|
|
}
|
|
|
|
// -- complex object return --
|
|
{
|
|
let result = push_and_wait(
|
|
&db,
|
|
RunJob::from(nativets_code(
|
|
r#"//native
|
|
|
|
export function main(items: {name: string, value: number}[]): {total: number, names: string[]} {
|
|
return {
|
|
total: items.reduce((sum, i) => sum + i.value, 0),
|
|
names: items.map(i => i.name).sort(),
|
|
};
|
|
}
|
|
"#,
|
|
))
|
|
.arg(
|
|
"items",
|
|
serde_json::json!([
|
|
{"name": "c", "value": 30},
|
|
{"name": "a", "value": 10},
|
|
{"name": "b", "value": 20}
|
|
]),
|
|
),
|
|
&mut listener,
|
|
)
|
|
.await;
|
|
assert!(result.success, "object_return failed: {:?}", result.result);
|
|
assert_eq!(
|
|
result.json_result().unwrap(),
|
|
serde_json::json!({"total": 60, "names": ["a", "b", "c"]})
|
|
);
|
|
}
|
|
|
|
// -- async function (Promise) --
|
|
{
|
|
let result = push_and_wait(
|
|
&db,
|
|
RunJob::from(nativets_code(
|
|
r#"//native
|
|
|
|
export async function main(): Promise<number> {
|
|
const result = await Promise.resolve(42);
|
|
return result;
|
|
}
|
|
"#,
|
|
)),
|
|
&mut listener,
|
|
)
|
|
.await;
|
|
assert!(result.success, "async failed: {:?}", result.result);
|
|
assert_eq!(result.json_result().unwrap(), serde_json::json!(42));
|
|
}
|
|
|
|
// -- fetch hitting the internal API server --
|
|
{
|
|
let code = format!(
|
|
r#"//native
|
|
|
|
export async function main(): Promise<object> {{
|
|
const resp = await fetch("http://localhost:{port}/api/version");
|
|
return {{ status: resp.status, ok: resp.ok }};
|
|
}}
|
|
"#
|
|
);
|
|
let result = push_and_wait(&db, RunJob::from(nativets_code(&code)), &mut listener).await;
|
|
assert!(result.success, "fetch failed: {:?}", result.result);
|
|
let val = result.json_result().unwrap();
|
|
assert_eq!(val["ok"], serde_json::json!(true));
|
|
assert_eq!(val["status"], serde_json::json!(200));
|
|
}
|
|
|
|
// -- regex --
|
|
{
|
|
let result = push_and_wait(
|
|
&db,
|
|
RunJob::from(nativets_code(
|
|
r#"//native
|
|
|
|
export function main(text: string, pattern: string): string[] {
|
|
const regex = new RegExp(pattern, 'g');
|
|
return [...text.matchAll(regex)].map(m => m[0]);
|
|
}
|
|
"#,
|
|
))
|
|
.arg("text", serde_json::json!("foo123bar456baz789"))
|
|
.arg("pattern", serde_json::json!("\\d+")),
|
|
&mut listener,
|
|
)
|
|
.await;
|
|
assert!(result.success, "regex failed: {:?}", result.result);
|
|
assert_eq!(
|
|
result.json_result().unwrap(),
|
|
serde_json::json!(["123", "456", "789"])
|
|
);
|
|
}
|
|
|
|
// -- JSON roundtrip --
|
|
{
|
|
let result = push_and_wait(
|
|
&db,
|
|
RunJob::from(nativets_code(
|
|
r#"//native
|
|
|
|
export function main(): string {
|
|
const data = JSON.stringify({ key: "value", nested: { arr: [1, 2, 3] } });
|
|
const parsed = JSON.parse(data);
|
|
return parsed.nested.arr.map((x: number) => x * 10).join(",");
|
|
}
|
|
"#,
|
|
)),
|
|
&mut listener,
|
|
)
|
|
.await;
|
|
assert!(result.success, "json_roundtrip failed: {:?}", result.result);
|
|
assert_eq!(result.json_result().unwrap(), serde_json::json!("10,20,30"));
|
|
}
|
|
|
|
// -- no args, array return --
|
|
{
|
|
let result = push_and_wait(
|
|
&db,
|
|
RunJob::from(nativets_code(
|
|
r#"//native
|
|
|
|
export function main(): number[] {
|
|
return Array.from({length: 5}, (_, i) => i * i);
|
|
}
|
|
"#,
|
|
)),
|
|
&mut listener,
|
|
)
|
|
.await;
|
|
assert!(result.success, "no_args failed: {:?}", result.result);
|
|
assert_eq!(
|
|
result.json_result().unwrap(),
|
|
serde_json::json!([0, 1, 4, 9, 16])
|
|
);
|
|
}
|
|
|
|
killpill.send();
|
|
Ok(())
|
|
}
|