Compare commits

2 Commits

Author SHA1 Message Date
mattbk
c9f6a4a6c5 Spot packets to spothole.app if desired. 2025-10-18 11:33:38 -05:00
mattbk
369de6f873 Make simple GET request from Spothole. 2025-10-18 10:43:56 -05:00
2 changed files with 39 additions and 0 deletions

View File

@@ -8,6 +8,7 @@ authors = ["Chris, N6CTA <mail@n6cta.com>"]
anyhow = "1.0"
chrono = "0.4"
clap = { version = "4", features = ["derive"] }
reqwest = { version = "0.12.24", features = ["json", "blocking"] }
serde_json = "1.0.145"
socket2 = "0.5"

View File

@@ -11,6 +11,7 @@ use std::time::{Duration, SystemTime, UNIX_EPOCH};
use std::net::UdpSocket;
use std::net::Ipv4Addr;
use serde_json::json;
use reqwest;
/// Validate that the provided port string can be parsed into a u16 and is nonzero.
fn validate_port(port: &str) -> Result<u16, String> {
@@ -62,6 +63,15 @@ struct Cli {
/// Spotter callsign (e.g. W1CDN)
#[arg(short = 's', long)]
spotter: Option<String>,
/// Spot UI frames to Spothole
#[arg(short = 'o', long, default_value_t = false)]
spothole: bool,
/// Spotting frequency
#[arg(short = 'f', long, default_value_t = 14105000)]
freq: u32,
}
/// Convert a byte slice into a hex-dump string for debugging purposes.
@@ -363,6 +373,7 @@ fn handle_frame(frame: &AgwFrame, cli: &Cli, buffers: &mut BufferManager) {
let basic_destination = hdr.callto_str();
let timestamp = Local::now().format("%H:%M:%S").to_string();
let spotter = &cli.spotter;
let freq = &cli.freq;
// Filter and compute the text from the payload only once.
let text = filter_text(&frame.payload);
@@ -400,6 +411,32 @@ fn handle_frame(frame: &AgwFrame, cli: &Cli, buffers: &mut BufferManager) {
return;
}
// If Spothole is enabled
if summary == "UI" && cli.spothole {
// curl --request POST --header "Content-Type: application/json"
// --data '{"dx_call":"M0TRT","time":1760019539, "freq":14200000,
// "comment":"Test spot please ignore", "de_call":"M0TRT"}' https://spothole.app/api/v1/spot
// POST JSON
let packet = json!({
"dx_call": &source,
"de_call": &spotter,
"freq": &freq,
"comment": &text,
"mode": "PKT",
"mode_type": "DATA",
"mode_source": "SPOT",
"time": SystemTime::now().duration_since(UNIX_EPOCH).unwrap().as_secs(),
});
let client = reqwest::blocking::Client::new();
let res = client.post("https://spothole.app/api/v1/spot")
.json(&packet)
.send();
println!("res = {res:?}");
}
// Send UDP
if cli.uport != 55555 {
let uaddr = format!("{}:{}", cli.uip, cli.uport);
@@ -411,6 +448,7 @@ fn handle_frame(frame: &AgwFrame, cli: &Cli, buffers: &mut BufferManager) {
"spotter": &spotter,
"summary": &summary,
"text": &text,
"freq": &freq,
"timestamp": SystemTime::now().duration_since(UNIX_EPOCH).unwrap().as_secs(),
"type": "data"
});