update api, fix tests and examples
This commit is contained in:
@@ -95,7 +95,7 @@ pub struct WasmJob {
|
||||
caller_id: String,
|
||||
context_id: String,
|
||||
payload: String,
|
||||
runner_name: String,
|
||||
runner: String,
|
||||
executor: String,
|
||||
timeout_secs: u64,
|
||||
env_vars: String, // JSON string of HashMap<String, String>
|
||||
@@ -138,8 +138,8 @@ impl WasmSupervisorClient {
|
||||
match self.call_method("register_runner", params).await {
|
||||
Ok(result) => {
|
||||
// Extract the runner name from the result
|
||||
if let Some(runner_name) = result.as_str() {
|
||||
Ok(runner_name.to_string())
|
||||
if let Some(runner) = result.as_str() {
|
||||
Ok(runner.to_string())
|
||||
} else {
|
||||
Err(JsValue::from_str("Invalid response format: expected runner name"))
|
||||
}
|
||||
@@ -159,7 +159,7 @@ impl WasmSupervisorClient {
|
||||
"caller_id": job.caller_id,
|
||||
"context_id": job.context_id,
|
||||
"payload": job.payload,
|
||||
"runner_name": job.runner_name,
|
||||
"runner": job.runner,
|
||||
"executor": job.executor,
|
||||
"timeout": {
|
||||
"secs": job.timeout_secs,
|
||||
@@ -194,7 +194,7 @@ impl WasmSupervisorClient {
|
||||
"caller_id": job.caller_id,
|
||||
"context_id": job.context_id,
|
||||
"payload": job.payload,
|
||||
"runner_name": job.runner_name,
|
||||
"runner": job.runner,
|
||||
"executor": job.executor,
|
||||
"timeout": {
|
||||
"secs": job.timeout_secs,
|
||||
@@ -258,7 +258,7 @@ impl WasmSupervisorClient {
|
||||
let caller_id = job_value.get("caller_id").and_then(|v| v.as_str()).unwrap_or("").to_string();
|
||||
let context_id = job_value.get("context_id").and_then(|v| v.as_str()).unwrap_or("").to_string();
|
||||
let payload = job_value.get("payload").and_then(|v| v.as_str()).unwrap_or("").to_string();
|
||||
let runner_name = job_value.get("runner_name").and_then(|v| v.as_str()).unwrap_or("").to_string();
|
||||
let runner = job_value.get("runner").and_then(|v| v.as_str()).unwrap_or("").to_string();
|
||||
let executor = job_value.get("executor").and_then(|v| v.as_str()).unwrap_or("").to_string();
|
||||
let timeout_secs = job_value.get("timeout").and_then(|v| v.get("secs")).and_then(|v| v.as_u64()).unwrap_or(30);
|
||||
let env_vars = job_value.get("env_vars").map(|v| v.to_string()).unwrap_or_else(|| "{}".to_string());
|
||||
@@ -270,7 +270,7 @@ impl WasmSupervisorClient {
|
||||
caller_id,
|
||||
context_id,
|
||||
payload,
|
||||
runner_name,
|
||||
runner,
|
||||
executor,
|
||||
timeout_secs,
|
||||
env_vars,
|
||||
@@ -477,14 +477,14 @@ impl WasmSupervisorClient {
|
||||
impl WasmJob {
|
||||
/// Create a new job with default values
|
||||
#[wasm_bindgen(constructor)]
|
||||
pub fn new(id: String, payload: String, executor: String, runner_name: String) -> Self {
|
||||
pub fn new(id: String, payload: String, executor: String, runner: String) -> Self {
|
||||
let now = js_sys::Date::new_0().to_iso_string().as_string().unwrap();
|
||||
Self {
|
||||
id,
|
||||
caller_id: "wasm_client".to_string(),
|
||||
context_id: "wasm_context".to_string(),
|
||||
payload,
|
||||
runner_name,
|
||||
runner,
|
||||
executor,
|
||||
timeout_secs: 30,
|
||||
env_vars: "{}".to_string(),
|
||||
@@ -555,8 +555,8 @@ impl WasmJob {
|
||||
|
||||
/// Get the runner name
|
||||
#[wasm_bindgen(getter)]
|
||||
pub fn runner_name(&self) -> String {
|
||||
self.runner_name.clone()
|
||||
pub fn runner(&self) -> String {
|
||||
self.runner.clone()
|
||||
}
|
||||
|
||||
/// Get the timeout in seconds
|
||||
@@ -657,8 +657,8 @@ pub fn init() {
|
||||
/// Utility function to create a job from JavaScript
|
||||
/// Create a new job (convenience function for JavaScript)
|
||||
#[wasm_bindgen]
|
||||
pub fn create_job(id: String, payload: String, executor: String, runner_name: String) -> WasmJob {
|
||||
WasmJob::new(id, payload, executor, runner_name)
|
||||
pub fn create_job(id: String, payload: String, executor: String, runner: String) -> WasmJob {
|
||||
WasmJob::new(id, payload, executor, runner)
|
||||
}
|
||||
|
||||
/// Utility function to create a client from JavaScript
|
||||
|
||||
Reference in New Issue
Block a user