upload: add logs for reqwest and improve error logging/handling

note: includes `use` commands which are unneeded rn
this is bc i cant be fucked to remove ones which are needed for the next commit. go fuck urself idc

upload/Cargo.lock

···
 ]
 
 [[package]]
+name = "addr2line"
+version = "0.25.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b5d307320b3181d6d7954e663bd7c774a838b8220fe0593c86d9fb09f498b4b"
+dependencies = [
+ "gimli",
+]
+
+[[package]]
 name = "adler2"
 version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
···
 version = "0.1.0"
 dependencies = [
  "clap",
+ "env_logger",
  "ignore",
  "jacquard",
+ "lexicons",
+ "miette",
  "mime_guess",
  "regex",
  "reqwest",
+ "thiserror 2.0.17",
  "tokio",
 ]
 
···
 version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"
+
+[[package]]
+name = "backtrace"
+version = "0.3.76"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bb531853791a215d7c62a30daf0dde835f381ab5de4589cfe7c649d2cbe92bd6"
+dependencies = [
+ "addr2line",
+ "cfg-if",
+ "libc",
+ "miniz_oxide",
+ "object",
+ "rustc-demangle",
+ "windows-link 0.2.1",
+]
+
+[[package]]
+name = "backtrace-ext"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "537beee3be4a18fb023b570f80e3ae28003db9167a751266b259926e25539d50"
+dependencies = [
+ "backtrace",
+]
 
 [[package]]
 name = "base-x"
···
 ]
 
 [[package]]
+name = "env_filter"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1bf3c259d255ca70051b30e2e95b5446cdb8949ac4cd22c0d7fd634d89f568e2"
+dependencies = [
+ "log",
+ "regex",
+]
+
+[[package]]
+name = "env_logger"
+version = "0.11.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "13c863f0904021b108aa8b2f55046443e6b1ebde8fd4a15c399893aae4fa069f"
+dependencies = [
+ "anstream",
+ "anstyle",
+ "env_filter",
+ "jiff",
+ "log",
+]
+
+[[package]]
 name = "equivalent"
 version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
···
 checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6"
 
 [[package]]
+name = "futures-macro"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.106",
+]
+
+[[package]]
 name = "futures-sink"
 version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
···
 checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81"
 dependencies = [
  "futures-core",
+ "futures-io",
+ "futures-macro",
+ "futures-sink",
  "futures-task",
+ "memchr",
  "pin-project-lite",
  "pin-utils",
  "slab",
···
  "wasip2",
  "wasm-bindgen",
 ]
+
+[[package]]
+name = "gimli"
+version = "0.32.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e629b9b98ef3dd8afe6ca2bd0f89306cec16d43d907889945bc5d6687f2f13c7"
 
 [[package]]
 name = "globset"
···
 ]
 
 [[package]]
+name = "is_ci"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7655c9839580ee829dfacba1d1278c2b7883e50a277ff7541299489d6bdfdc45"
+
+[[package]]
 name = "is_terminal_polyfill"
 version = "1.70.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
···
 
 [[package]]
 name = "jacquard"
-version = "0.5.3"
+version = "0.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf257386e29370eb7387093736d59f2aeda3ac692a37481c7201bc5f9cc82fae"
+checksum = "c9f7e9e2fb15b8e526c8f44ba197ba8b4174858d05522f088d1ff8de0ce02836"
 dependencies = [
  "bon",
  "bytes",
···
 
 [[package]]
 name = "jacquard-api"
-version = "0.5.3"
+version = "0.5.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e67619aa60467ee687633e5face5743835e5f9d8e57c387a8d830cfd2ba8d2c8"
+checksum = "eef8307959cc031759816d8e44a3c4db5dd184eedec07431579877a8c4741b80"
 dependencies = [
  "bon",
  "bytes",
···
 
 [[package]]
 name = "jacquard-common"
-version = "0.5.3"
+version = "0.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b1c05d479eee46004ba3ec495e7802b7c02cc429396aeb7296a558b9cb6e6ce"
+checksum = "cf91dfa4ade1ca83c9afccee4ece7ed72b6607a0853d88623958d4e7c5382eb3"
 dependencies = [
  "base64 0.22.1",
  "bon",
···
 
 [[package]]
 name = "jacquard-derive"
-version = "0.5.3"
+version = "0.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aadace50223141e60d16e26a28c8c8a9b647f291814986010234cf1c130367ab"
+checksum = "4f7db8498da87d842297b169a0080eed751bce173c56626b5fa71261fe72f804"
 dependencies = [
  "proc-macro2",
  "quote",
···
 
 [[package]]
 name = "jacquard-oauth"
-version = "0.5.3"
+version = "0.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "597e74c6697a449e834936dde22c30165f0f2da0c38b42ec599173b58d73a098"
+checksum = "0c583fb0f634654b51d390809f4dc5b08087d34c155b33d89b36475f6e6b1428"
 dependencies = [
  "base64 0.22.1",
  "bytes",
···
 ]
 
 [[package]]
+name = "jiff"
+version = "0.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "be1f93b8b1eb69c77f24bbb0afdf66f54b632ee39af40ca21c4365a1d7347e49"
+dependencies = [
+ "jiff-static",
+ "log",
+ "portable-atomic",
+ "portable-atomic-util",
+ "serde",
+]
+
+[[package]]
+name = "jiff-static"
+version = "0.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "03343451ff899767262ec32146f6d559dd759fdadf42ff0e227c7c48f72594b4"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.106",
+]
+
+[[package]]
 name = "jni"
 version = "0.21.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
···
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5f98efec8807c63c752b5bd61f862c165c115b0a35685bdcfd9238c7aeb592b7"
 dependencies = [
+ "backtrace",
+ "backtrace-ext",
  "cfg-if",
  "miette-derive",
- "unicode-width",
+ "owo-colors",
+ "supports-color",
+ "supports-hyperlinks",
+ "supports-unicode",
+ "terminal_size",
+ "textwrap",
+ "unicode-width 0.1.14",
 ]
 
 [[package]]
···
 ]
 
 [[package]]
+name = "object"
+version = "0.37.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ff76201f031d8863c38aa7f905eca4f53abbfa15f609db4277d44cd8938f33fe"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
 name = "once_cell"
 version = "1.21.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
···
 ]
 
 [[package]]
+name = "owo-colors"
+version = "4.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c6901729fa79e91a0913333229e9ca5dc725089d1c363b2f4b4760709dc4a52"
+
+[[package]]
 name = "p256"
 version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
···
 version = "0.3.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c"
+
+[[package]]
+name = "portable-atomic"
+version = "1.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f84267b20a16ea918e43c6a88433c2d54fa145c92a811b5b047ccbe153674483"
+
+[[package]]
+name = "portable-atomic-util"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d8a2f0d8d040d7848a709caf78912debcc3f33ee4b3cac47d73d1e1069e83507"
+dependencies = [
+ "portable-atomic",
+]
 
 [[package]]
 name = "potential_utf"
···
  "url",
  "wasm-bindgen",
  "wasm-bindgen-futures",
+ "wasm-streams",
  "web-sys",
  "webpki-roots",
 ]
···
 ]
 
 [[package]]
+name = "rustc-demangle"
+version = "0.1.26"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "56f7d92ca342cea22a06f2121d944b4fd82af56988c270852495420f961d4ace"
+
+[[package]]
 name = "rustc-hash"
 version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
···
 
 [[package]]
 name = "rustls"
-version = "0.23.32"
+version = "0.23.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd3c25631629d034ce7cd9940adc9d45762d46de2b0f57193c4443b92c6d4d40"
+checksum = "751e04a496ca00bb97a5e043158d23d66b5aabf2e1d5aa2a0aaebb1aafe6f82c"
 dependencies = [
  "once_cell",
  "ring",
···
 checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
 
 [[package]]
+name = "supports-color"
+version = "3.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c64fc7232dd8d2e4ac5ce4ef302b1d81e0b80d055b9d77c7c4f51f6aa4c867d6"
+dependencies = [
+ "is_ci",
+]
+
+[[package]]
+name = "supports-hyperlinks"
+version = "3.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "804f44ed3c63152de6a9f90acbea1a110441de43006ea51bcce8f436196a288b"
+
+[[package]]
+name = "supports-unicode"
+version = "3.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b7401a30af6cb5818bb64852270bb722533397edcfc7344954a38f420819ece2"
+
+[[package]]
 name = "syn"
 version = "1.0.109"
 source = "registry+https://github.com/rust-lang/crates.io-index"
···
 ]
 
 [[package]]
+name = "terminal_size"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "60b8cb979cb11c32ce1603f8137b22262a9d131aaa5c37b5678025f22b8becd0"
+dependencies = [
+ "rustix",
+ "windows-sys 0.60.2",
+]
+
+[[package]]
+name = "textwrap"
+version = "0.16.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c13547615a44dc9c452a8a534638acdf07120d4b6847c8178705da06306a3057"
+dependencies = [
+ "unicode-linebreak",
+ "unicode-width 0.2.2",
+]
+
+[[package]]
 name = "thiserror"
 version = "1.0.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
···
 checksum = "f63a545481291138910575129486daeaf8ac54aee4387fe7906919f7830c7d9d"
 
 [[package]]
+name = "unicode-linebreak"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f"
+
+[[package]]
 name = "unicode-width"
 version = "0.1.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af"
+
+[[package]]
+name = "unicode-width"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b4ac048d71ede7ee76d585517add45da530660ef4390e49b098733c6e897f254"
 
 [[package]]
 name = "unsigned-varint"
···
 checksum = "bad67dc8b2a1a6e5448428adec4c3e84c43e561d8c9ee8a9e5aabeb193ec41d1"
 dependencies = [
  "unicode-ident",
+]
+
+[[package]]
+name = "wasm-streams"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "15053d8d85c7eccdbefef60f06769760a563c7f0a9d6902a13d35c7800b0ad65"
+dependencies = [
+ "futures-util",
+ "js-sys",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "web-sys",
 ]
 
 [[package]]

upload/Cargo.toml

···
 edition = "2024"
 
 [dependencies]
-# lexicons = { path = "./lexicons" }
+lexicons = { path = "./lexicons" }
 clap = { version = "4.5.49", features = ["derive"] }
 ignore = "0.4.23"
 regex = "1.12.2"
 mime_guess = "2.0.5"
 tokio = { version = "1.48.0", features = ["full"] }
-jacquard = { version = "0.5.3", features = ["api", "dns"] }
-reqwest = { version = "0.12.24", features = [
-  "__tls",
-  "charset",
-  "default-tls",
-  "h2",
-  "http2",
-  "system-proxy",
-] }
+jacquard = "0.5.4"
+reqwest = "0.12.24"
+env_logger = "0.11.8"
+miette = { version = "7.6.0", features = ["derive", "fancy"] }
+thiserror = "2.0.17"

upload/src/main.rs

···
 use clap::{ArgAction, Parser};
+use jacquard::api::com_atproto::repo::apply_writes::{self, ApplyWrites, ApplyWritesWritesItem};
+use jacquard::atproto;
 use jacquard::client::MemorySessionStore;
+use jacquard::prelude::XrpcClient;
+use jacquard::types::string::{AtStrError, RecordKey, Rkey};
 use jacquard::{
   Data,
   api::com_atproto::{self, repo::list_records::ListRecords},
-  client::{Agent, AgentSessionExt, credential_session::CredentialSession},
+  client::{Agent, credential_session::CredentialSession},
   cowstr::ToCowStr,
   identity::JacquardResolver,
   types::{ident::AtIdentifier, nsid::Nsid, string::AtprotoStr, uri::Uri},
   xrpc::XrpcExt,
 };
+use miette::{ErrReport, IntoDiagnostic, Result};
 use std::{collections::HashMap, fs, path::PathBuf};
 
 use crate::sitemap::{BlobRef, Sitemap, SitemapNode};
···
 }
 
 #[tokio::main]
-async fn main() -> Result<(), ()> {
+async fn main() -> Result<(), miette::Error> {
+  env_logger::init();
   // get config items
   let config = Config::parse();
 
   // get local site info
-  let local_sitemap = sitemap::local_sitemap(config.dir, config.all_files, config.git_ignore)
-    .map_err(|err| {
-      println!("Sitemap Error: {}", err);
-    })?;
+  let local_sitemap = sitemap::local_sitemap(config.dir, config.all_files, config.git_ignore)?;
 
   // create session
   let client = JacquardResolver::default();
   let store = MemorySessionStore::default();
   let session = CredentialSession::new(store.into(), client.into());
 
-  let auth = match session
+  let auth = session
     .login(config.user.into(), config.password.into(), None, None, None)
-    .await
-  {
-    Ok(val) => {
-      println!("Authenticated {} ({})", val.handle, val.did);
-      val
-    }
-    Err(err) => {
-      println!("Got error while authenticating:\n{}", err);
-      return Err(());
-    }
-  };
+    .await?;
+  println!("Authenticated as {}", auth.did);
+
 
   let agent = Agent::from(session);
 
···
     let res = agent
       .xrpc(agent.endpoint().await)
       .send::<ListRecords>(&req)
-      .await
-      .map_err(|err| {
-        println!("Error fetching records: {err}");
-      })?
-      .into_output()
-      .map_err(|err| {
-        println!("Error fetching records: {err}");
-      })?;
+      .await?
+      .into_output()?;
 
     for record in res.records {
       match record {
···
     }
   }
 
-  println!("{remote_records:?}");
-
   // upload local site blobs
   let mut new_sitemap: Sitemap = HashMap::new();
   for (k, v) in local_sitemap {
···
         panic!("Impossible state")
       }
     };
-    let blob = fs::read(blob).map_err(|err| {
-      println!("FS error: {err}");
-    })?;
-    let res = agent
-      .upload_blob(blob, v.mime_type.clone().into())
-      .await
-      .map_err(|err| {
-        println!("Blob upload error: {err}");
-      })?;
+    let blob = fs::read(blob).into_diagnostic()?;
+    // let res = agent
+    //   .upload_blob(blob, v.mime_type.clone().into())
+    //   .await?;
+
+    let req = com_atproto::repo::upload_blob::UploadBlob::new()
+      .body(blob.into())
+      .build();
+    let res = agent.send(req).await?.into_output()?;
+
     new_sitemap.insert(
       k,
       SitemapNode {
         mime_type: v.mime_type,
-        blob: BlobRef::Remote(res.r#ref),
+        blob: BlobRef::Remote(res.blob),
       },
     );
   }
-  println!("{:#?}", new_sitemap);
 
   // batch delete/upload records
 

upload/src/sitemap.rs

···
 use ignore::WalkBuilder;
-use jacquard::types::cid::Cid;
+use jacquard::types::blob::Blob;
+use miette::Diagnostic;
 use mime_guess::mime;
-use std::{collections::HashMap, error::Error, fmt, path::PathBuf};
+use std::{collections::HashMap, path::PathBuf};
+use thiserror::Error;
 
 pub type Sitemap = HashMap<String, SitemapNode>;
 
···
 #[derive(Debug)]
 pub enum BlobRef {
   Local(PathBuf),
-  Remote(Cid<'static>),
+  Remote(Blob<'static>),
 }
 
-#[derive(Debug)]
+#[derive(Debug, Error, Diagnostic)]
 pub enum SitemapErr {
-  IoErr(std::io::Error),
-  IgnoreErr(ignore::Error),
-  StripPrefixErr(std::path::StripPrefixError),
+  #[error("IO error: {}", .0)]
+  IoErr(#[from] std::io::Error),
+  #[error("Error finding files: {}", .0)]
+  IgnoreErr(#[from] ignore::Error),
+  #[error("Error normalising file paths: {}", .0)]
+  StripPrefixErr(#[from] std::path::StripPrefixError),
+  #[error("Found non UTF-8 path")]
   NotUTF8Path,
 }
 
-impl From<std::io::Error> for SitemapErr {
-  fn from(value: std::io::Error) -> Self {
-    SitemapErr::IoErr(value)
-  }
-}
-
-impl From<ignore::Error> for SitemapErr {
-  fn from(value: ignore::Error) -> Self {
-    SitemapErr::IgnoreErr(value)
-  }
-}
-
-impl From<std::path::StripPrefixError> for SitemapErr {
-  fn from(value: std::path::StripPrefixError) -> Self {
-    SitemapErr::StripPrefixErr(value)
-  }
-}
-
-impl Error for SitemapErr {}
-
-impl fmt::Display for SitemapErr {
-  fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-    match self {
-      SitemapErr::IoErr(err) => write!(f, "IO Error: {}", err),
-      SitemapErr::IgnoreErr(err) => write!(f, "Ignore Error: {}", err),
-      SitemapErr::StripPrefixErr(err) => write!(f, "File Path Error: {}", err),
-      SitemapErr::NotUTF8Path => write!(f, "Found a path that was not UTF-8"),
-    }
-  }
-}
-
 pub fn local_sitemap(
   dir: PathBuf,
   include_dotfiles: bool,
   use_gitignore: bool,
-) -> Result<Sitemap, SitemapErr> {
+) -> miette::Result<Sitemap, SitemapErr> {
   let prefix = dir.canonicalize()?;
 
   let mut res = HashMap::new();