random ud

Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "derive_http"
+name = "http_derive"
 version = "0.1.0"
 edition = "2024"
 
@@ -11,3 +11,4 @@ async-trait = "0.1.88"
 proc-macro2 = "1.0.95"
 quote = "1.0.40"
 syn = { version = "2.0.104", features = ["full"] }
+http_core = { path = "../http_core" }

src/lib.rs

@@ -2,14 +2,15 @@ use proc_macro::TokenStream;
 use quote::quote;
 use syn::{parse_macro_input, Lit, ItemEnum, DeriveInput, Fields, Data};
 use quote::format_ident;
+use http_core::{Queryable, ApiDispatch, HasHttp, Keys};
 
-#[proc_macro_derive(HttpRequest, attributes(http_get, http_response))]
+#[proc_macro_derive(HttpRequest, attributes(http_response, http_error_type))]
 pub fn derive_http_get_request(input: TokenStream) -> TokenStream {
     let input = parse_macro_input!(input as DeriveInput);
     let query_name = &input.ident;
     let query_name_str = query_name.to_string();
 
-    // Parse optional #[http_response = "..."] attribute via parse_nested_meta
+    // Parse optional #[http_response = "..."] attribute
     let mut response_name_opt: Option<String> = None;
     for attr in &input.attrs {
         if attr.path().is_ident("http_response") {
@@ -25,37 +26,26 @@ pub fn derive_http_get_request(input: TokenStream) -> TokenStream {
         }
     }
 
-    // Determine response type name
-    let response_name_str = if let Some(custom_resp) = response_name_opt {
-        custom_resp
-    } else if query_name_str == "Q" {
-        "R".to_string()
-    } else if query_name_str.ends_with('Q') {
-        format!("{}R", &query_name_str[..query_name_str.len() - 1])
-    } else {
-        panic!("HttpRequest derive macro expects the type name to be 'Q' or end with 'Q', or specify #[http_response = \"...\"] to override");
-    };
+    let response_name_str = response_name_opt.unwrap_or_else(|| format!("{}Resp", query_name_str));
     let response_name = format_ident!("{}", response_name_str);
 
-    // Extract base URL from #[http_get(url = "...")]
-    let mut base_url = None;
+    // Parse optional #[http_error_type = "..."] attribute (default to `E`)
+    let mut error_type = syn::Path::from(syn::Ident::new("E", proc_macro2::Span::call_site()));
     for attr in &input.attrs {
-        if attr.path().is_ident("http_get") {
+        if attr.path().is_ident("http_error_type") {
             attr.parse_nested_meta(|meta| {
-                if meta.path.is_ident("url") {
+                if meta.path.is_ident("http_error_type") {
                     let lit: Lit = meta.value()?.parse()?;
                     if let Lit::Str(litstr) = lit {
-                        base_url = Some(litstr.value());
+                        error_type = syn::parse_str(&litstr.value()).unwrap();
                     }
                 }
                 Ok(())
-            }).unwrap_or_else(|e| panic!("Error parsing http_get attribute: {}", e));
+            }).unwrap_or_else(|e| panic!("Error parsing http_error_type attribute: {}", e));
         }
     }
-    let base_url = base_url.expect("Missing #[http_get(url = \"...\")] attribute");
-    let base_url_lit = syn::LitStr::new(&base_url, proc_macro2::Span::call_site());
 
-    // Collect query parameters from fields named "lnk_p_*" (only for structs)
+    // Collect query parameters from lnk_p_* fields
     let query_param_code = if let Data::Struct(data_struct) = &input.data {
         if let Fields::Named(fields_named) = &data_struct.fields {
             fields_named.named.iter().filter_map(|field| {
@@ -64,7 +54,9 @@ pub fn derive_http_get_request(input: TokenStream) -> TokenStream {
                 if field_name.starts_with("lnk_p_") {
                     let key = &field_name["lnk_p_".len()..];
                     Some(quote! {
-                        query_params.push((#key.to_string(), self.#ident.to_string()));
+                        if let Some(val) = &self.#ident {
+                            query_params.push((#key.to_string(), val.to_string()));
+                        }
                     })
                 } else {
                     None
@@ -84,15 +76,16 @@ pub fn derive_http_get_request(input: TokenStream) -> TokenStream {
 
             async fn send(
                 &self,
+                base_url: &str,
                 headers: Option<Vec<(&str, &str)>>,
-            ) -> Result<Self::R, Box<dyn std::error::Error + Send + Sync>> {
+            ) -> Result<Self::R, #error_type> {
                 use awc::Client;
                 use urlencoding::encode;
 
                 let mut query_params: Vec<(String, String)> = Vec::new();
                 #(#query_param_code)*
 
-                let mut url = #base_url_lit.to_string();
+                let mut url = base_url.to_string();
                 if !query_params.is_empty() {
                     let mut query_string = String::new();
                     let mut first = true;
@@ -118,7 +111,6 @@ pub fn derive_http_get_request(input: TokenStream) -> TokenStream {
 
                 let response = request.send().await?;
                 let bytes = response.body().await?;
-
                 let parsed: Self::R = serde_json::from_slice(&bytes)?;
                 Ok(parsed)
             }
@@ -128,123 +120,163 @@ pub fn derive_http_get_request(input: TokenStream) -> TokenStream {
     TokenStream::from(expanded)
 }
 
+
 #[proc_macro_attribute]
 pub fn alpaca_cli(_attr: TokenStream, item: TokenStream) -> TokenStream {
     let input_enum = parse_macro_input!(item as ItemEnum);
-    let enum_name = &input_enum.ident;
-    let variants = &input_enum.variants;
+    let top_enum_ident = &input_enum.ident;
+    let top_variants = &input_enum.variants;
 
-    // Match arms for regular command variants (Single, Asset, etc.)
-    let regular_arms = variants.iter().filter_map(|v| {
-        let v_name = &v.ident;
+    // Build outer match arms
+    let match_arms: Vec<_> = top_variants.iter().map(|variant| {
+        let variant_ident = &variant.ident;
 
-        // Skip Bulk variant — we handle it separately
-        if v_name == "Bulk" {
-            return None;
-        }
-
-        Some(quote! {
-            #enum_name::#v_name(req) => {
-                let res = req.send(client.clone(), &api_key).await?;
-                let body = res.body().await?;
-                println!("{}", std::str::from_utf8(&body)?);
+        // Expecting tuple variants like Alpaca(AlpacaCmd)
+        let inner_type = match &variant.fields {
+            Fields::Unnamed(fields) if fields.unnamed.len() == 1 => {
+                match &fields.unnamed.first().unwrap().ty {
+                    syn::Type::Path(p) => p.path.segments.last().unwrap().ident.clone(),
+                    _ => panic!("Expected tuple variant with a type path"),
+                }
             }
-        })
-    });
+            _ => panic!("Each variant must be a tuple variant like `Alpaca(AlpacaCmd)`"),
+        };
 
+        quote! {
+            #top_enum_ident::#variant_ident(inner) => {
+                match inner {
+                    #inner_type::Bulk { input } => {
+                        let mut reader: Box<dyn std::io::Read> = match input {
+                            Some(path) => Box::new(std::fs::File::open(path)?),
+                            None => Box::new(std::io::stdin()),
+                        };
+
+                        let mut buf = String::new();
+                        reader.read_to_string(&mut buf)?;
+                        let queries: Vec<#inner_type> = serde_json::from_str(&buf)?;
+
+                        use std::sync::Arc;
+                        let client = Arc::new(awc::Client::default());
+                        let keys = Arc::new(crate::load_api_keys()?);
+
+                        const THREADS: usize = 4;
+                        let total = queries.len();
+                        let per_thread = std::cmp::max(1, total / THREADS);
+                        let shared_queries = Arc::new(queries);
+
+                        let mut handles = Vec::new();
+                        for i in 0..THREADS {
+                            let queries = Arc::clone(&shared_queries);
+                            let client = Arc::clone(&client);
+                            let keys = Arc::clone(&keys);
+                            let start = i * per_thread;
+                            let end = if i == THREADS - 1 { total } else { start + per_thread };
+
+                            let handle = std::thread::spawn(move || {
+                                let rt = tokio::runtime::Runtime::new().unwrap();
+                                for q in &queries[start..end] {
+                                    rt.block_on(q.send_all(&client, &keys)).unwrap();
+                                }
+                            });
+
+                            handles.push(handle);
+                        }
+
+                        for h in handles {
+                            h.join().expect("Thread panicked");
+                        }
+                    }
+                    other => {
+                        let client = awc::Client::default();
+                        let keys = crate::load_api_keys()?;
+                        other.send_all(&client, &keys).await?;
+                    }
+                }
+            }
+        }
+    }).collect();
+
+    // Generate the final code
     let expanded = quote! {
-        #[derive(structopt::StructOpt, Debug)]
+        use clap::Parser;
+        use std::io::Read;
+
+        #[derive(clap::Parser, Debug)]
         #input_enum
 
         #[tokio::main]
         async fn main() -> Result<(), Box<dyn std::error::Error>> {
-            use structopt::StructOpt;
-            use std::fs::File;
-            use std::io::{BufReader, Read};
-            use std::sync::Arc;
-            use std::thread;
-
-            const THREADS: usize = 4;
-
-            // Initialize shared HTTP client and API key
-            let client = Arc::new(awc::Client::default());
-            let api_key = std::env::var("APCA_API_KEY_ID")?;
-            let cmd = #enum_name::from_args();
-
+            let cmd = #top_enum_ident::parse();
             match cmd {
-                #(#regular_arms)*
-
-                #enum_name::Bulk { input } => {
-                    // Choose input source: file or stdin
-                    let mut reader: Box<dyn Read> = match input {
-                        Some(path) => Box::new(File::open(path)?),
-                        None => Box::new(std::io::stdin()),
-                    };
-
-                    // Read input JSON into buffer
-                    let mut buf = String::new();
-                    reader.read_to_string(&mut buf)?;
-
-                    // Deserialize into Vec<Query>
-                    let queries: Vec<Query> = serde_json::from_str(&buf)?;
-                    let total = queries.len();
-
-                    if total == 0 {
-                        eprintln!("No queries provided.");
-                        return Ok(());
-                    }
-
-                    let shared_queries = Arc::new(queries);
-                    let shared_key = Arc::new(api_key);
-
-                    let per_thread = total / THREADS;
-
-                    let mut handles = Vec::with_capacity(THREADS);
-                    for i in 0..THREADS {
-                        let queries_clone = Arc::clone(&shared_queries);
-                        let client_clone = Arc::clone(&client);
-                        let key_clone = Arc::clone(&shared_key);
-
-                        let start_index = i * per_thread;
-                        let end_index = if i == THREADS - 1 {
-                            total // Last thread gets the remainder
-                        } else {
-                            start_index + per_thread
-                        };
-
-                        let handle = thread::spawn(move || {
-                            let rt = tokio::runtime::Runtime::new().expect("Failed to create runtime");
-                            for idx in start_index..end_index {
-                                let query = &queries_clone[idx];
-                                let send_result = rt.block_on(query.send(client_clone.clone(), &key_clone));
-
-                                match send_result {
-                                    Ok(response) => {
-                                        let body_result = rt.block_on(response.body());
-                                        match body_result {
-                                            Ok(body) => println!("{}", String::from_utf8_lossy(&body)),
-                                            Err(e) => eprintln!("Error reading response body: {:?}", e),
-                                        }
-                                    }
-                                    Err(e) => {
-                                        eprintln!("Request failed: {:?}", e);
-                                    }
-                                }
-                            }
-                        });
-
-                        handles.push(handle);
-                    }
-
-                    // Wait for all threads to complete
-                    for handle in handles {
-                        handle.join().expect("A thread panicked");
-                    }
-                }
+                #(#match_arms),*
             }
-
             Ok(())
         }
+
+        // Trait for dispatching API calls
+        pub trait ApiDispatch {
+            fn send_all(
+                &self,
+                client: &awc::Client,
+                keys: &std::collections::HashMap<String, crate::Keys>,
+            ) -> std::pin::Pin<Box<dyn std::future::Future<Output = Result<(), Box<dyn std::error::Error>>> + Send>>;
+        }
+    };
+
+    TokenStream::from(expanded)
+}
+
+#[proc_macro_attribute]
+pub fn api_dispatch(attr: TokenStream, item: TokenStream) -> TokenStream {
+    let input = parse_macro_input!(item as syn::ItemEnum);
+    let enum_ident = &input.ident;
+
+    // Parse attribute input: input = "MyQuery"
+    let meta_args = attr.to_string();
+    let input_type: syn::Ident = {
+        let cleaned = meta_args.trim().replace("input", "").replace('=', "").replace('"', "").trim().to_string();
+        syn::Ident::new(&cleaned, proc_macro2::Span::call_site())
+    };
+
+    let expanded = quote! {
+        #input
+
+        impl ApiDispatch for #enum_ident {
+            fn send_all(
+                &self,
+                client: &awc::Client,
+                keys: &std::collections::HashMap<String, crate::Keys>,
+            ) -> std::pin::Pin<Box<dyn std::future::Future<Output = Result<(), Box<dyn std::error::Error>>> + Send>> {
+                Box::pin(async move {
+                    match self {
+                        #enum_ident::Single { query } => {
+                            let parsed: #input_type = serde_json::from_str(query)?;
+                            parsed.send(client, keys).await?;
+                        }
+                        #enum_ident::Bulk { input } => {
+                            let json = if let Some(raw) = input {
+                                if std::path::Path::new(&raw).exists() {
+                                    std::fs::read_to_string(raw)?
+                                } else {
+                                    raw.clone()
+                                }
+                            } else {
+                                use std::io::Read;
+                                let mut buf = String::new();
+                                std::io::stdin().read_to_string(&mut buf)?;
+                                buf
+                            };
+
+                            let items: Vec<#input_type> = serde_json::from_str(&json)?;
+                            for item in items {
+                                item.send(client, keys).await?;
+                            }
+                        }
+                    }
+                    Ok(())
+                })
+            }
+        }
     };
 
     TokenStream::from(expanded)