Max/LowderPlay_cheburcheck
1
0
Fork 0
mirror of https://github.com/LowderPlay/cheburcheck.git synced 2026-09-30 10:47:54 +03:00
Code Issues Packages Projects Releases Wiki Activity

feat: individual tasks (#86)

Browse Source 
* feat: hidden nodes and individual tasks

* chore: bump version
This commit is contained in:
LowderPlay
2026-08-25 17:21:07 +05:00
committed by GitHub
parent ada091c060
commit a92572ffdf
13 changed files with 216 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
probe/src/main.rs
+30 -4
View File
@@ -101,6 +101,12 @@ async fn main() -> Result<()> {
client
.subscribe("probe/tasks/v1/+", QoS::AtLeastOnce)
.await?;
client
.subscribe(
format!("probe/tasks/v1/{}/+", args.probe_id),
QoS::AtLeastOnce,
)
.await?;
info!(
"probe {} connected over WebSocket to {}",
@@ -176,6 +182,12 @@ async fn main() -> Result<()> {
client
.subscribe("probe/tasks/v1/+", QoS::AtLeastOnce)
.await?;
client
.subscribe(
format!("probe/tasks/v1/{}/+", args.probe_id),
QoS::AtLeastOnce,
)
.await?;
tokio::time::sleep(Duration::from_secs(2)).await;
}
}
@@ -349,10 +361,7 @@ async fn handle_task(
task: ProbeTask<'_>,
received_at: Instant,
) -> Result<()> {
let job_id = topic
.strip_prefix("probe/tasks/v1/")
.filter(|id| !id.is_empty())
.unwrap_or(&task.id);
let job_id = probe_task_job_id(topic).unwrap_or(&task.id);
let timeout = Duration::from_millis(task.timeout_ms);
let Some(remaining) = timeout.checked_sub(received_at.elapsed()) else {
warn!(
@@ -427,10 +436,27 @@ async fn handle_task(
.context("publish probe result")
}
fn probe_task_job_id(topic: &str) -> Option<&str> {
let parts = topic.split('/').collect::<Vec<_>>();
match parts.as_slice() {
["probe", "tasks", "v1", job_id] if !job_id.is_empty() => Some(job_id),
["probe", "tasks", "v1", _recipient, job_id] if !job_id.is_empty() => Some(job_id),
_ => None,
}
}
#[cfg(test)]
mod tests {
use super::*;
#[test]
fn extracts_job_id_from_legacy_global_and_individual_topics() {
assert_eq!(probe_task_job_id("probe/tasks/v1/job-1"), Some("job-1"));
assert_eq!(probe_task_job_id("probe/tasks/v1/42/job-2"), Some("job-2"));
assert_eq!(probe_task_job_id("probe/tasks/v1"), None);
assert_eq!(probe_task_job_id("probe/tasks/v1/42/job-2/extra"), None);
}
#[test]
fn decodes_separate_dpi_targets() {
let config: ProbeConfig = serde_json::from_value(serde_json::json!({