Merge pull request 'Spot UI frames to spothole.app' (#13) from spothole into dev

Reviewed-on: w1cdn/mwtchahrd#13

Cargo.toml

@@ -8,6 +8,8 @@ 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"
 
 [profile.release]

README.md

@@ -37,7 +37,7 @@ The compiled executable will be located in the `target/release` directory.
 Run the executable with the required arguments:
 
 ```bash
-mwtchahrd -i <IP> -p <PORT> [-c <CHANNEL>] [-d] [-u]
+mwtchahrd -i <IP> -p <PORT> [-c <CHANNEL>] [-d] [-u] 
 ```
 
 ### Command‑Line Arguments
@@ -56,6 +56,30 @@ mwtchahrd -i <IP> -p <PORT> [-c <CHANNEL>] [-d] [-u]
 
 - `-u, --ui_only`  
   Only display frames with a UI payload. When this flag is set, frames that are not UI are skipped.
+  
+- `-b, --uip <UIP>`
+  Send UDP to what IP address (e.g. 127.0.0.1) [default: 127.0.0.1].
+  
+- `-k, --uport <UPORT>`
+  Send UDP to what port (e.g. 8000; 55555 disables UDP) [default: 55555].
+  
+- `-s, --spotter <SPOTTER>`            
+  Spotter callsign (e.g. W1CDN).
+  
+- `-o, --spothole`                     
+  Spot UI frames to a Spothole server.
+  
+- `-O, --spothole-alt <SPOTHOLE_ALT>` 
+  Provide a different URL than https://spothole.app/api/v1/spot.
+  
+- `-f, --freq <FREQ>`                 
+  Spotting frequency [default: 14105000].
+
+- `-h, --help`                         
+  Print help.
+  
+- `-V, --version`                      
+  Print version.
 
 ## Examples
 
@@ -83,6 +107,14 @@ Monitor only UI frames:
 mwtchahrd -i 127.0.0.1 -p 8000 -u
 ```
 
+### Spotting to [Spothole.app](https://spothole.app) API
+
+Sends only UI frames and mode is hardcoded as `PKT`. Spot from callsign `W1CDN` and report fixed frequency 14.105 MHz:
+
+```bash
+mwtchahrd --ip 192.168.0.6 --port 8000 --spotter W1CDN --spothole --freq 14105000
+```
+
 ## Code Overview
 
 - **Validation Functions:**  

src/main.rs

@@ -7,7 +7,11 @@ use std::convert::TryInto;
 use std::io::{Read, Write};
 use std::net::TcpStream;
 use std::thread::sleep;
-use std::time::Duration;
+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> {
@@ -31,7 +35,7 @@ struct Cli {
     /// AGWPE server IP address (e.g. 127.0.0.1)
     #[arg(short = 'i', long)]
     ip: std::net::IpAddr,
-
+    
     /// AGWPE server TCP port (e.g. 8000)
     #[arg(short = 'p', long, value_parser = validate_port)]
     port: u16,
@@ -47,6 +51,31 @@ struct Cli {
     /// Only monitor UI frames
     #[arg(short = 'u', long, default_value_t = false)]
     ui_only: bool,
+    
+    /// Send UDP to what IP address (e.g. 127.0.0.1)
+    #[arg(short = 'b', long, default_value_t = std::net::IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)))]
+    uip: std::net::IpAddr,
+    
+    /// Send UDP to what port (e.g. 8000; 55555 disables UDP)
+    #[arg(short = 'k', long, value_parser = validate_port, default_value_t = 55555)]
+    uport: u16,
+    
+    /// Spotter callsign (e.g. W1CDN)
+    #[arg(short = 's', long)]
+    spotter: Option<String>,
+    
+    /// Spot UI frames to a Spothole server
+    #[arg(short = 'o', long, default_value_t = false)]
+    spothole: bool,
+    
+    /// Provide a different URL than https://spothole.app/api/v1/spot
+    #[arg(short = 'O', long)]
+    spothole_alt: Option<String>,
+    
+    /// Spotting frequency
+    #[arg(short = 'f', long, default_value_t = 14105000)]
+    freq: u32,
+    
 }
 
 /// Convert a byte slice into a hex-dump string for debugging purposes.
@@ -347,6 +376,15 @@ fn handle_frame(frame: &AgwFrame, cli: &Cli, buffers: &mut BufferManager) {
     let source = hdr.callfrom_str();
     let basic_destination = hdr.callto_str();
     let timestamp = Local::now().format("%H:%M:%S").to_string();
+    let spotter = &cli.spotter;
+    let freq = &cli.freq;
+    //let spothole_alt = &cli.spothole_alt;
+    
+    // If user provides an alternate Spothole URL, use that one
+    let spothole_url = match &cli.spothole_alt {
+        Some(spothole_alt) => spothole_alt,
+        None => &"https://spothole.app/api/v1/spot".to_string(),
+    };
 
     // Filter and compute the text from the payload only once.
     let text = filter_text(&frame.payload);
@@ -383,6 +421,53 @@ fn handle_frame(frame: &AgwFrame, cli: &Cli, buffers: &mut BufferManager) {
     if cli.ui_only && summary != "UI" {
         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
+        
+        println!("spothole_url: {}", spothole_url);
+        
+        
+        // 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(spothole_url)
+            .json(&packet)
+            .send();
+        println!("res = {res:?}");
+        
+        
+    }
+
+    // Send UDP
+    if cli.uport != 55555 {
+        let uaddr = format!("{}:{}", cli.uip, cli.uport);
+        let socket = UdpSocket::bind("0.0.0.0:0");
+        
+        let packet = json!({
+            "final_destination": &final_destination,
+            "source": &source,
+            "spotter": &spotter,
+            "summary": &summary,
+            "text": &text,
+            "freq": &freq,
+            "timestamp": SystemTime::now().duration_since(UNIX_EPOCH).unwrap().as_secs(),
+            "type": "data"
+        });
+        let _ = socket.expect("REASON").send_to(packet.to_string().as_bytes(), uaddr);
+    }
 
     // In non-debug mode, print the session line and any additional lines.
     if !cli.debug {
@@ -403,7 +488,22 @@ fn handle_frame(frame: &AgwFrame, cli: &Cli, buffers: &mut BufferManager) {
 fn main() -> Result<()> {
     let cli = Cli::parse();
     let addr = format!("{}:{}", cli.ip, cli.port);
+    let uaddr = format!("{}:{}", cli.uip, cli.uport);
     let reconnect_delay_ms = 5000;
+    
+    if cli.uport != 55555 {
+        // Bind the client socket to any available address and port
+        let socket = UdpSocket::bind("0.0.0.0:0")?;
+        println!("UDP client started at {}:{}", cli.uip, cli.uport);
+        // Send a message to the server
+        let packet = json!({
+            "text": "UDP client connected",
+            "timestamp": SystemTime::now().duration_since(UNIX_EPOCH).unwrap().as_secs(),
+            "type": "status"
+        });
+        //let message = "UDP client connected";
+        socket.send_to(packet.to_string().as_bytes(), uaddr)?;
+    }
 
     loop {
         println!("Connecting to AGWPE server at {addr}");