Implement upload progress tracking with speed and progress bar

Co-authored-by: v0l <1172179+v0l@users.noreply.github.com>

Cargo.lock

@@ -691,6 +691,19 @@ dependencies = [
  "yaml-rust2",
 ]
 
+[[package]]
+name = "console"
+version = "0.15.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "054ccb5b10f9f2cbf51eb355ca1d05c2d279ce1804688d0db74b4733a5aeafd8"
+dependencies = [
+ "encode_unicode",
+ "libc",
+ "once_cell",
+ "unicode-width",
+ "windows-sys 0.59.0",
+]
+
 [[package]]
 name = "const-oid"
 version = "0.9.6"
@@ -958,6 +971,12 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "encode_unicode"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34aa73646ffb006b8f5147f3dc182bd4bcb190227ce861fc4a4844bf8e3cb2c0"
+
 [[package]]
 name = "encoding_rs"
 version = "0.8.35"
@@ -1070,7 +1089,7 @@ dependencies = [
 [[package]]
 name = "ffmpeg-rs-raw"
 version = "0.1.0"
-source = "git+https://git.v0l.io/Kieran/ffmpeg-rs-raw.git?rev=928ab9664ff47c1b0bd8313ebc73d13b1ab43fc5#928ab9664ff47c1b0bd8313ebc73d13b1ab43fc5"
+source = "git+https://git.v0l.io/Kieran/ffmpeg-rs-raw.git?rev=aa1ce3edcad0fcd286d39b3e0c2fdc610c3988e7#aa1ce3edcad0fcd286d39b3e0c2fdc610c3988e7"
 dependencies = [
  "anyhow",
  "ffmpeg-sys-the-third",
@@ -1975,6 +1994,19 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "indicatif"
+version = "0.17.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "183b3088984b400f4cfac3620d5e076c84da5364016b4f49473de574b2586235"
+dependencies = [
+ "console",
+ "number_prefix",
+ "portable-atomic",
+ "unicode-width",
+ "web-time",
+]
+
 [[package]]
 name = "infer"
 version = "0.19.0"
@@ -2454,6 +2486,12 @@ dependencies = [
  "syn",
 ]
 
+[[package]]
+name = "number_prefix"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3"
+
 [[package]]
 name = "object"
 version = "0.36.7"
@@ -2760,6 +2798,12 @@ dependencies = [
  "universal-hash",
 ]
 
+[[package]]
+name = "portable-atomic"
+version = "1.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f84267b20a16ea918e43c6a88433c2d54fa145c92a811b5b047ccbe153674483"
+
 [[package]]
 name = "powerfmt"
 version = "0.2.0"
@@ -3265,6 +3309,7 @@ dependencies = [
  "ffmpeg-rs-raw",
  "hex",
  "http-range-header",
+ "indicatif",
  "infer",
  "libc",
  "log",
@@ -3279,6 +3324,7 @@ dependencies = [
  "tokio",
  "tokio-util",
  "uuid",
+ "walkdir",
 ]
 
 [[package]]
@@ -4528,6 +4574,12 @@ version = "1.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493"
 
+[[package]]
+name = "unicode-width"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4a1a07cc7db3810833284e8d372ccdc6da29741639ecc70c9ec107df0fa6154c"
+
 [[package]]
 name = "unicode-xid"
 version = "0.2.6"
@@ -4742,6 +4794,16 @@ dependencies = [
  "wasm-bindgen",
 ]
 
+[[package]]
+name = "web-time"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb"
+dependencies = [
+ "js-sys",
+ "wasm-bindgen",
+]
+
 [[package]]
 name = "whoami"
 version = "1.6.0"

Cargo.toml

@@ -11,7 +11,7 @@ path = "src/bin/main.rs"
 name = "route96"
 
 [features]
-default = ["nip96", "blossom", "analytics", "react-ui", "payments"]
+default = ["nip96", "blossom", "analytics", "react-ui", "payments", "r96util"]
 media-compression = ["dep:ffmpeg-rs-raw", "dep:libc"]
 labels = ["media-compression", "dep:candle-core", "dep:candle-nn", "dep:candle-transformers"]
 nip96 = ["media-compression"]
@@ -19,6 +19,7 @@ blossom = []
 analytics = []
 react-ui = []
 payments = ["dep:fedimint-tonic-lnd"]
+r96util = ["dep:walkdir", "dep:indicatif"]
 
 [dependencies]
 log = "0.4.21"
@@ -44,8 +45,10 @@ http-range-header = { version = "0.4.2" }
 base58 = "0.2.0"
 
 libc = { version = "0.2.153", optional = true }
-ffmpeg-rs-raw = { git = "https://git.v0l.io/Kieran/ffmpeg-rs-raw.git", rev = "928ab9664ff47c1b0bd8313ebc73d13b1ab43fc5", optional = true }
+ffmpeg-rs-raw = { git = "https://git.v0l.io/Kieran/ffmpeg-rs-raw.git", rev = "aa1ce3edcad0fcd286d39b3e0c2fdc610c3988e7", optional = true }
 candle-core = { git = "https://git.v0l.io/huggingface/candle.git", tag = "0.8.1", optional = true }
 candle-nn = { git = "https://git.v0l.io/huggingface/candle.git", tag = "0.8.1", optional = true }
 candle-transformers = { git = "https://git.v0l.io/huggingface/candle.git", tag = "0.8.1", optional = true }
-fedimint-tonic-lnd = { version = "0.2.0", optional = true, default-features = false, features = ["invoicesrpc", "lightningrpc"] }
+fedimint-tonic-lnd = { version = "0.2.0", optional = true, default-features = false, features = ["invoicesrpc", "lightningrpc"] }
+walkdir = { version = "2.5.0", optional = true }
+indicatif = { version = "0.17.11", optional = true }

src/bin/r96util.rs

@@ -0,0 +1,229 @@
+use anyhow::{Context, Error, Result};
+use clap::{Parser, Subcommand};
+use config::Config;
+use indicatif::{ProgressBar, ProgressStyle};
+use log::{error, info};
+use route96::db::{Database, FileUpload};
+use route96::filesystem::{FileStore, FileSystemResult};
+use route96::processing::probe_file;
+use route96::settings::Settings;
+use std::future::Future;
+use std::path::{Path, PathBuf};
+use std::pin::Pin;
+use std::sync::Arc;
+use std::time::SystemTime;
+use pretty_env_logger::env_logger;
+use tokio::sync::Semaphore;
+
+#[derive(Parser, Debug)]
+#[command(version, about)]
+struct Args {
+    #[arg(long)]
+    pub config: Option<String>,
+
+    #[clap(subcommand)]
+    pub command: Commands,
+}
+
+#[derive(Debug, Subcommand)]
+enum Commands {
+    /// Check file hash matches filename / path
+    Check {
+        #[arg(long)]
+        delete: Option<bool>,
+    },
+
+    /// Import a directory into the filesystem
+    /// (does NOT import files into the database, use database-import command for that)
+    Import {
+        #[arg(long)]
+        from: PathBuf,
+        #[arg(long, default_missing_value = "true", num_args = 0..=1)]
+        probe_media: Option<bool>,
+    },
+
+    /// Import files from filesystem into database
+    DatabaseImport {
+        /// Don't actually import data and just print which files WOULD be imported
+        #[arg(long, default_missing_value = "true", num_args = 0..=1)]
+        dry_run: Option<bool>,
+    },
+}
+
+#[tokio::main]
+async fn main() -> Result<(), Error> {
+    if std::env::var("RUST_LOG").is_err() {
+        unsafe { std::env::set_var("RUST_LOG", "info"); }
+    }
+    env_logger::init();
+
+    let args: Args = Args::parse();
+
+    let builder = Config::builder()
+        .add_source(config::File::with_name(if let Some(ref c) = args.config {
+            c.as_str()
+        } else {
+            "config.yaml"
+        }))
+        .add_source(config::Environment::with_prefix("APP"))
+        .build()?;
+
+    let settings: Settings = builder.try_deserialize()?;
+
+    match args.command {
+        Commands::Check { delete } => {
+            info!("Checking files in: {}", settings.storage_dir);
+            let fs = FileStore::new(settings.clone());
+            iter_files(&fs.storage_dir(), 4, |entry, p| {
+                let p = p.clone();
+                Box::pin(async move {
+                    let id = if let Some(i) = id_from_path(&entry) {
+                        i
+                    } else {
+                        p.set_message(format!("Skipping invalid file: {}", &entry.display()));
+                        return Ok(());
+                    };
+
+                    let hash = FileStore::hash_file(&entry).await?;
+                    if hash != id {
+                        if delete.unwrap_or(false) {
+                            p.set_message(format!("Deleting corrupt file: {}", &entry.display()));
+                            tokio::fs::remove_file(&entry).await?;
+                        } else {
+                            p.set_message(format!("File is corrupted: {}", &entry.display()));
+                        }
+                    }
+                    Ok(())
+                })
+            })
+                .await?;
+        }
+        Commands::Import { from, probe_media } => {
+            let fs = FileStore::new(settings.clone());
+            let db = Database::new(&settings.database).await?;
+            db.migrate().await?;
+            info!("Importing from: {}", fs.storage_dir().display());
+            iter_files(&from, 4, |entry, p| {
+                let fs = fs.clone();
+                let p = p.clone();
+                Box::pin(async move {
+                    let mime = infer::get_from_path(&entry)?
+                        .map(|m| m.mime_type())
+                        .unwrap_or("application/octet-stream");
+
+                    // test media is not corrupt
+                    if probe_media.unwrap_or(true)
+                        && (mime.starts_with("image/") || mime.starts_with("video/"))
+                        && probe_file(&entry).is_err()
+                    {
+                        p.set_message(format!("Skipping media invalid file: {}", &entry.display()));
+                        return Ok(());
+                    }
+
+                    let file = tokio::fs::File::open(&entry).await?;
+                    let dst = fs.put(file, mime, false).await?;
+                    match dst {
+                        FileSystemResult::AlreadyExists(_) => {
+                            p.set_message(format!("Duplicate file: {}", &entry.display()));
+                        }
+                        FileSystemResult::NewFile(_) => {
+                            p.set_message(format!("Imported: {}", &entry.display()));
+                        }
+                    }
+                    Ok(())
+                })
+            })
+                .await?;
+        }
+        Commands::DatabaseImport { dry_run } => {
+            let fs = FileStore::new(settings.clone());
+            let db = Database::new(&settings.database).await?;
+            db.migrate().await?;
+            info!("Importing to DB from: {}", fs.storage_dir().display());
+            iter_files(&fs.storage_dir(), 4, |entry, p| {
+                let db = db.clone();
+                let p = p.clone();
+                Box::pin(async move {
+                    let id = if let Some(i) = id_from_path(&entry) {
+                        i
+                    } else {
+                        p.set_message(format!("Skipping invalid file: {}", &entry.display()));
+                        return Ok(());
+                    };
+                    let u = db.get_file(&id).await.context("db get_file")?;
+                    if u.is_none() {
+                        if !dry_run.unwrap_or(false) {
+                            p.set_message(format!("Importing file: {}", &entry.display()));
+                            let mime = infer::get_from_path(&entry)
+                                .context("infer")?
+                                .map(|m| m.mime_type())
+                                .unwrap_or("application/octet-stream")
+                                .to_string();
+                            let meta = entry.metadata().context("file metadata")?;
+                            let entry = FileUpload {
+                                id,
+                                name: None,
+                                size: meta.len(),
+                                mime_type: mime,
+                                created: meta.created().unwrap_or(SystemTime::now()).into(),
+                                width: None,
+                                height: None,
+                                blur_hash: None,
+                                alt: None,
+                                duration: None,
+                                bitrate: None,
+                            };
+                            db.add_file(&entry, None).await.context("db add_file")?;
+                        } else {
+                            p.set_message(format!(
+                                "[DRY-RUN] Importing file: {}",
+                                &entry.display()
+                            ));
+                        }
+                    }
+                    Ok(())
+                })
+            })
+                .await?;
+        }
+    }
+    Ok(())
+}
+
+fn id_from_path(path: &Path) -> Option<Vec<u8>> {
+    hex::decode(path.file_name()?.to_str()?).ok()
+}
+
+async fn iter_files<F>(p: &Path, threads: usize, mut op: F) -> Result<()>
+where
+    F: FnMut(PathBuf, ProgressBar) -> Pin<Box<dyn Future<Output = Result<()>> + Send>>,
+{
+    let semaphore = Arc::new(Semaphore::new(threads));
+    info!("Scanning files: {}", p.display());
+    let entries = walkdir::WalkDir::new(p);
+    let dir = entries
+        .into_iter()
+        .filter_map(Result::ok)
+        .filter(|e| e.file_type().is_file())
+        .collect::<Vec<_>>();
+    let p = ProgressBar::new(dir.len() as u64).with_style(ProgressStyle::with_template(
+        "{spinner} [{pos}/{len}] {msg}",
+    )?);
+    let mut all_tasks = vec![];
+    for entry in dir {
+        let _lock = semaphore.clone().acquire_owned().await?;
+        p.inc(1);
+        let fut = op(entry.path().to_path_buf(), p.clone());
+        all_tasks.push(tokio::spawn(async move {
+            if let Err(e) = fut.await {
+                error!("Error processing file: {} {}", entry.path().display(), e);
+            }
+            drop(_lock);
+        }));
+    }
+    for task in all_tasks {
+        task.await?;
+    }
+    p.finish_with_message("Done!");
+    Ok(())
+}

src/db.rs

@@ -193,7 +193,7 @@ impl Database {
             .try_get(0)
     }
 
-    pub async fn add_file(&self, file: &FileUpload, user_id: u64) -> Result<(), Error> {
+    pub async fn add_file(&self, file: &FileUpload, user_id: Option<u64>) -> Result<(), Error> {
         let mut tx = self.pool.begin().await?;
         let q = sqlx::query("insert ignore into \
         uploads(id,name,size,mime_type,blur_hash,width,height,alt,created,duration,bitrate) values(?,?,?,?,?,?,?,?,?,?,?)")
@@ -210,10 +210,12 @@ impl Database {
             .bind(file.bitrate);
         tx.execute(q).await?;
 
-        let q2 = sqlx::query("insert ignore into user_uploads(file,user_id) values(?,?)")
-            .bind(&file.id)
-            .bind(user_id);
-        tx.execute(q2).await?;
+        if let Some(uid) = user_id {
+            let q2 = sqlx::query("insert ignore into user_uploads(file,user_id) values(?,?)")
+                .bind(&file.id)
+                .bind(uid);
+            tx.execute(q2).await?;
+        }
 
         #[cfg(feature = "labels")]
         for lbl in &file.labels {

src/filesystem.rs

@@ -10,6 +10,7 @@ use anyhow::Error;
 use anyhow::Result;
 #[cfg(feature = "media-compression")]
 use ffmpeg_rs_raw::DemuxerInfo;
+#[cfg(feature = "media-compression")]
 use ffmpeg_rs_raw::StreamInfo;
 #[cfg(feature = "media-compression")]
 use rocket::form::validate::Contains;

src/processing/mod.rs

@@ -105,7 +105,12 @@ impl WebpProcessor {
             let mut decoder = Decoder::new();
             decoder.setup_decoder(image_stream, None)?;
 
-            while let Ok((mut pkt, _stream)) = input.get_packet() {
+            while let Ok((mut pkt, _)) = input.get_packet() {
+                // skip packets not in the image stream
+                if (*pkt).stream_index != image_stream.index as i32 {
+                    av_packet_free(&mut pkt);
+                    continue;
+                }
                 let mut frame_save: *mut AVFrame = ptr::null_mut();
                 for (mut frame, _stream) in decoder.decode_pkt(pkt)? {
                     if frame_save.is_null() {

src/routes/admin.rs

@@ -1,5 +1,5 @@
 use crate::auth::nip98::Nip98Auth;
-use crate::db::{Database, FileUpload, User, Report};
+use crate::db::{Database, FileUpload, Report, User};
 use crate::routes::{Nip94Event, PagedResult};
 use crate::settings::Settings;
 use rocket::serde::json::Json;
@@ -8,7 +8,12 @@ use rocket::{routes, Responder, Route, State};
 use sqlx::{Error, QueryBuilder, Row};
 
 pub fn admin_routes() -> Vec<Route> {
-    routes![admin_list_files, admin_get_self, admin_list_reports, admin_acknowledge_report]
+    routes![
+        admin_list_files,
+        admin_get_self,
+        admin_list_reports,
+        admin_acknowledge_report
+    ]
 }
 
 #[derive(Serialize, Default)]
@@ -71,7 +76,11 @@ pub struct AdminNip94File {
 }
 
 #[rocket::get("/self")]
-async fn admin_get_self(auth: Nip98Auth, db: &State<Database>, settings: &State<Settings>) -> AdminResponse<SelfUser> {
+async fn admin_get_self(
+    auth: Nip98Auth,
+    db: &State<Database>,
+    settings: &State<Settings>,
+) -> AdminResponse<SelfUser> {
     let pubkey_vec = auth.event.pubkey.to_bytes().to_vec();
     match db.get_user(&pubkey_vec).await {
         Ok(user) => {
@@ -84,18 +93,20 @@ async fn admin_get_self(auth: Nip98Auth, db: &State<Database>, settings: &State<
 
             #[cfg(feature = "payments")]
             let (free_quota, total_available_quota) = {
-                let free_quota = settings.payments.as_ref()
+                let free_quota = settings
+                    .payments
+                    .as_ref()
                     .and_then(|p| p.free_quota_bytes)
                     .unwrap_or(104857600);
                 let mut total_available = free_quota;
-                
+
                 // Add paid quota if still valid
                 if let Some(paid_until) = &user.paid_until {
                     if *paid_until > chrono::Utc::now() {
                         total_available += user.paid_size;
                     }
                 }
-                
+
                 (free_quota, total_available)
             };
 
@@ -223,8 +234,9 @@ impl Database {
     ) -> Result<(Vec<(FileUpload, Vec<User>)>, i64), Error> {
         let mut q = QueryBuilder::new("select u.* from uploads u ");
         if let Some(m) = mime_type {
-            q.push("where u.mime_type = ");
+            q.push("where INSTR(u.mime_type,");
             q.push_bind(m);
+            q.push(") > 0");
         }
         q.push(" order by u.created desc limit ");
         q.push_bind(limit);

src/routes/blossom.rs

@@ -465,7 +465,7 @@ where
             }
         }
     }
-    if let Err(e) = db.add_file(&upload, user_id).await {
+    if let Err(e) = db.add_file(&upload, Some(user_id)).await {
         error!("{}", e);
         BlossomResponse::error(format!("Error saving file (db): {}", e))
     } else {

src/routes/mod.rs

@@ -423,7 +423,8 @@ pub async fn get_blob_thumb(
 
     if !thumb_file.exists() {
         let mut p = WebpProcessor::new();
-        if p.thumbnail(&file_path, &thumb_file).is_err() {
+        if let Err(e) = p.thumbnail(&file_path, &thumb_file) {
+            warn!("Failed to generate thumbnail: {}", e);
             return Err(Status::InternalServerError);
         }
     };

src/routes/nip96.rs

@@ -281,7 +281,7 @@ async fn upload(
         }
     }
 
-    if let Err(e) = db.add_file(&upload, user_id).await {
+    if let Err(e) = db.add_file(&upload, Some(user_id)).await {
         error!("{}", e);
         return Nip96Response::error(&format!("Could not save file (db): {}", e));
     }

ui_src/src/components/progress-bar.tsx

@@ -0,0 +1,62 @@
+import { UploadProgress, formatSpeed, formatTime } from "../upload/progress";
+import { FormatBytes } from "../const";
+
+interface ProgressBarProps {
+  progress: UploadProgress;
+  fileName?: string;
+}
+
+export default function ProgressBar({ progress, fileName }: ProgressBarProps) {
+  const {
+    percentage,
+    bytesUploaded,
+    totalBytes,
+    averageSpeed,
+    estimatedTimeRemaining,
+  } = progress;
+
+  return (
+    <div className="bg-gray-800 border border-gray-700 rounded-lg p-4">
+      <div className="flex items-center justify-between mb-2">
+        <h4 className="font-medium text-blue-400">
+          {fileName ? `Uploading ${fileName}` : "Uploading..."}
+        </h4>
+        <span className="text-sm text-gray-400">
+          {percentage.toFixed(1)}%
+        </span>
+      </div>
+      
+      {/* Progress Bar */}
+      <div className="w-full bg-gray-700 rounded-full h-2.5 mb-3">
+        <div
+          className="bg-blue-500 h-2.5 rounded-full transition-all duration-300"
+          style={{ width: `${Math.min(100, percentage)}%` }}
+        />
+      </div>
+      
+      {/* Upload Stats */}
+      <div className="grid grid-cols-1 md:grid-cols-3 gap-3 text-sm">
+        <div>
+          <span className="text-gray-400">Progress:</span>
+          <span className="ml-2 font-medium">
+            {FormatBytes(bytesUploaded)} / {FormatBytes(totalBytes)}
+          </span>
+        </div>
+        
+        <div>
+          <span className="text-gray-400">Speed:</span>
+          <span className="ml-2 font-medium text-green-400">
+            {formatSpeed(averageSpeed)}
+          </span>
+        </div>
+        
+        <div>
+          <span className="text-gray-400">ETA:</span>
+          <span className="ml-2 font-medium">
+            {formatTime(estimatedTimeRemaining)}
+          </span>
+        </div>
+      </div>
+    </div>
+  );
+}

ui_src/src/upload/blossom.ts

@@ -1,6 +1,7 @@
 import { base64, bytesToString } from "@scure/base";
 import { throwIfOffline, unixNow } from "@snort/shared";
 import { EventKind, EventPublisher } from "@snort/system";
+import { UploadProgressCallback, uploadWithProgress } from "./progress";
 
 export interface BlobDescriptor {
   url?: string;
@@ -28,14 +29,14 @@ export class Blossom {
     }
   }
 
-  async upload(file: File): Promise<BlobDescriptor> {
+  async upload(file: File, onProgress?: UploadProgressCallback): Promise<BlobDescriptor> {
     const hash = await window.crypto.subtle.digest(
       "SHA-256",
       await file.arrayBuffer(),
     );
     const tags = [["x", bytesToString("hex", new Uint8Array(hash))]];
 
-    const rsp = await this.#req("upload", "PUT", "upload", file, tags);
+    const rsp = await this.#req("upload", "PUT", "upload", file, tags, undefined, onProgress);
     if (rsp.ok) {
       return (await rsp.json()) as BlobDescriptor;
     } else {
@@ -44,14 +45,14 @@ export class Blossom {
     }
   }
 
-  async media(file: File): Promise<BlobDescriptor> {
+  async media(file: File, onProgress?: UploadProgressCallback): Promise<BlobDescriptor> {
     const hash = await window.crypto.subtle.digest(
       "SHA-256",
       await file.arrayBuffer(),
     );
     const tags = [["x", bytesToString("hex", new Uint8Array(hash))]];
 
-    const rsp = await this.#req("media", "PUT", "media", file, tags);
+    const rsp = await this.#req("media", "PUT", "media", file, tags, undefined, onProgress);
     if (rsp.ok) {
       return (await rsp.json()) as BlobDescriptor;
     } else {
@@ -106,6 +107,7 @@ export class Blossom {
     body?: BodyInit,
     tags?: Array<Array<string>>,
     headers?: Record<string, string>,
+    onProgress?: UploadProgressCallback,
   ) {
     throwIfOffline();
 
@@ -126,14 +128,22 @@ export class Blossom {
       )}`;
     };
 
+    const requestHeaders = {
+      ...headers,
+      accept: "application/json",
+      authorization: await auth(url, method),
+    };
+
+    // Use progress-enabled upload for PUT requests with body
+    if (method === "PUT" && body && onProgress) {
+      return await uploadWithProgress(url, method, body, requestHeaders, onProgress);
+    }
+
+    // Fall back to regular fetch for other requests
     return await fetch(url, {
       method,
       body,
-      headers: {
-        ...headers,
-        accept: "application/json",
-        authorization: await auth(url, method),
-      },
+      headers: requestHeaders,
     });
   }
 }

ui_src/src/upload/nip96.ts

@@ -1,6 +1,7 @@
 import { base64 } from "@scure/base";
 import { throwIfOffline } from "@snort/shared";
 import { EventKind, EventPublisher, NostrEvent } from "@snort/system";
+import { UploadProgressCallback, uploadWithProgress } from "./progress";
 
 export class Nip96 {
   #info?: Nip96Info;
@@ -28,14 +29,14 @@ export class Nip96 {
     return data;
   }
 
-  async upload(file: File) {
+  async upload(file: File, onProgress?: UploadProgressCallback) {
     const fd = new FormData();
     fd.append("size", file.size.toString());
     fd.append("caption", file.name);
     fd.append("content_type", file.type);
     fd.append("file", file);
 
-    const rsp = await this.#req("", "POST", fd);
+    const rsp = await this.#req("", "POST", fd, onProgress);
     const data = await this.#handleResponse<Nip96Result>(rsp);
     if (data.status !== "success") {
       throw new Error(data.message);
@@ -57,7 +58,7 @@ export class Nip96 {
     }
   }
 
-  async #req(path: string, method: "GET" | "POST" | "DELETE", body?: BodyInit) {
+  async #req(path: string, method: "GET" | "POST" | "DELETE", body?: BodyInit, onProgress?: UploadProgressCallback) {
     throwIfOffline();
     const auth = async (url: string, method: string) => {
       const auth = await this.publisher.generic((eb) => {
@@ -77,13 +78,22 @@ export class Nip96 {
       u = `${this.url}${u.slice(1)}`;
     }
     u += path;
+
+    const requestHeaders = {
+      accept: "application/json",
+      authorization: await auth(u, method),
+    };
+
+    // Use progress-enabled upload for POST requests with FormData
+    if (method === "POST" && body && onProgress) {
+      return await uploadWithProgress(u, method, body, requestHeaders, onProgress);
+    }
+
+    // Fall back to regular fetch for other requests
     return await fetch(u, {
       method,
       body,
-      headers: {
-        accept: "application/json",
-        authorization: await auth(u, method),
-      },
+      headers: requestHeaders,
     });
   }
 }

ui_src/src/upload/progress.ts

@@ -0,0 +1,184 @@
+// Upload progress tracking types and utilities
+
+export interface UploadProgress {
+  percentage: number;
+  bytesUploaded: number;
+  totalBytes: number;
+  averageSpeed: number; // bytes per second
+  estimatedTimeRemaining: number; // seconds
+  startTime: number;
+}
+
+export interface UploadProgressCallback {
+  (progress: UploadProgress): void;
+}
+
+export class ProgressTracker {
+  private startTime: number;
+  private lastUpdateTime: number;
+  private bytesUploaded: number = 0;
+  private totalBytes: number;
+  private speedSamples: number[] = [];
+  private maxSamples = 10; // Keep last 10 speed samples for averaging
+
+  constructor(totalBytes: number) {
+    this.totalBytes = totalBytes;
+    this.startTime = Date.now();
+    this.lastUpdateTime = this.startTime;
+  }
+
+  update(bytesUploaded: number): UploadProgress {
+    const now = Date.now();
+    const timeDiff = now - this.lastUpdateTime;
+    
+    // Calculate instantaneous speed
+    if (timeDiff > 0) {
+      const bytesDiff = bytesUploaded - this.bytesUploaded;
+      const instantSpeed = (bytesDiff / timeDiff) * 1000; // bytes per second
+      
+      // Keep a rolling average of speed samples
+      this.speedSamples.push(instantSpeed);
+      if (this.speedSamples.length > this.maxSamples) {
+        this.speedSamples.shift();
+      }
+    }
+
+    this.bytesUploaded = bytesUploaded;
+    this.lastUpdateTime = now;
+
+    // Calculate average speed
+    const averageSpeed = this.speedSamples.length > 0 
+      ? this.speedSamples.reduce((sum, speed) => sum + speed, 0) / this.speedSamples.length
+      : 0;
+
+    // Calculate estimated time remaining
+    const remainingBytes = this.totalBytes - bytesUploaded;
+    const estimatedTimeRemaining = averageSpeed > 0 ? remainingBytes / averageSpeed : 0;
+
+    return {
+      percentage: (bytesUploaded / this.totalBytes) * 100,
+      bytesUploaded,
+      totalBytes: this.totalBytes,
+      averageSpeed,
+      estimatedTimeRemaining,
+      startTime: this.startTime,
+    };
+  }
+}
+
+// Utility function to format speed for display
+export function formatSpeed(bytesPerSecond: number): string {
+  if (bytesPerSecond === 0) return "0 B/s";
+  
+  const units = ["B/s", "KB/s", "MB/s", "GB/s"];
+  let value = bytesPerSecond;
+  let unitIndex = 0;
+  
+  while (value >= 1024 && unitIndex < units.length - 1) {
+    value /= 1024;
+    unitIndex++;
+  }
+  
+  return `${value.toFixed(1)} ${units[unitIndex]}`;
+}
+
+// Utility function to format time for display
+export function formatTime(seconds: number): string {
+  if (seconds === 0 || !isFinite(seconds)) return "--";
+  
+  const minutes = Math.floor(seconds / 60);
+  const remainingSeconds = Math.floor(seconds % 60);
+  
+  if (minutes > 0) {
+    return `${minutes}m ${remainingSeconds}s`;
+  } else {
+    return `${remainingSeconds}s`;
+  }
+}
+
+// XMLHttpRequest wrapper with progress tracking
+export function uploadWithProgress(
+  url: string,
+  method: string,
+  body: BodyInit | null,
+  headers: Record<string, string>,
+  onProgress?: UploadProgressCallback,
+): Promise<Response> {
+  return new Promise((resolve, reject) => {
+    const xhr = new XMLHttpRequest();
+    
+    // Determine total size
+    let totalSize = 0;
+    if (body instanceof File) {
+      totalSize = body.size;
+    } else if (body instanceof FormData) {
+      // For FormData, we need to estimate size
+      const formData = body as FormData;
+      for (const [, value] of formData.entries()) {
+        if (value instanceof File) {
+          totalSize += value.size;
+        } else if (typeof value === 'string') {
+          totalSize += new Blob([value]).size;
+        }
+      }
+    }
+
+    const tracker = new ProgressTracker(totalSize);
+
+    // Set up progress tracking
+    if (onProgress && totalSize > 0) {
+      xhr.upload.addEventListener('progress', (event) => {
+        if (event.lengthComputable) {
+          const progress = tracker.update(event.loaded);
+          onProgress(progress);
+        }
+      });
+    }
+
+    // Set up response handling
+    xhr.addEventListener('load', () => {
+      const response = new Response(xhr.response, {
+        status: xhr.status,
+        statusText: xhr.statusText,
+        headers: parseHeaders(xhr.getAllResponseHeaders()),
+      });
+      resolve(response);
+    });
+
+    xhr.addEventListener('error', () => {
+      reject(new Error('Network error'));
+    });
+
+    xhr.addEventListener('abort', () => {
+      reject(new Error('Upload aborted'));
+    });
+
+    // Configure request
+    xhr.open(method, url);
+    
+    // Set headers
+    for (const [key, value] of Object.entries(headers)) {
+      xhr.setRequestHeader(key, value);
+    }
+
+    // Send request
+    xhr.send(body as XMLHttpRequestBodyInit | Document | null);
+  });
+}
+
+// Helper function to parse response headers
+function parseHeaders(headerString: string): Headers {
+  const headers = new Headers();
+  const lines = headerString.trim().split('\r\n');
+  
+  for (const line of lines) {
+    const colonIndex = line.indexOf(':');
+    if (colonIndex > 0) {
+      const name = line.substring(0, colonIndex).trim();
+      const value = line.substring(colonIndex + 1).trim();
+      headers.append(name, value);
+    }
+  }
+  
+  return headers;
+}

ui_src/src/views/admin.tsx

@@ -122,16 +122,16 @@ export default function Admin() {
   }, [pub, self, url]);
 
   useEffect(() => {
-    if (pub && self?.is_admin && !adminListedFiles) {
+    if (pub && self?.is_admin) {
       listAllUploads(adminListedPage);
     }
-  }, [adminListedPage, pub, self?.is_admin, listAllUploads, adminListedFiles]);
+  }, [adminListedPage, pub, self?.is_admin, listAllUploads]);
 
   useEffect(() => {
-    if (pub && self?.is_admin && !reports) {
+    if (pub && self?.is_admin) {
       listReports(reportPage);
     }
-  }, [reportPage, pub, self?.is_admin, listReports, reports]);
+  }, [reportPage, pub, self?.is_admin, listReports]);
 
   if (loading) {
     return (

ui_src/src/views/upload.tsx

@@ -2,6 +2,7 @@ import { useEffect, useState, useCallback } from "react";
 import Button from "../components/button";
 import FileList from "./files";
 import PaymentFlow from "../components/payment";
+import ProgressBar from "../components/progress-bar";
 import { openFile } from "../upload";
 import { Blossom } from "../upload/blossom";
 import useLogin from "../hooks/login";
@@ -9,6 +10,7 @@ import usePublisher from "../hooks/publisher";
 import { Nip96, Nip96FileList } from "../upload/nip96";
 import { AdminSelf, Route96 } from "../upload/admin";
 import { FormatBytes } from "../const";
+import { UploadProgress } from "../upload/progress";
 
 export default function Upload() {
   const [type, setType] = useState<"blossom" | "nip96">("blossom");
@@ -20,6 +22,8 @@ export default function Upload() {
   const [listedFiles, setListedFiles] = useState<Nip96FileList>();
   const [listedPage, setListedPage] = useState(0);
   const [showPaymentFlow, setShowPaymentFlow] = useState(false);
+  const [isUploading, setIsUploading] = useState(false);
+  const [uploadProgress, setUploadProgress] = useState<UploadProgress>();
 
   const login = useLogin();
   const pub = usePublisher();
@@ -29,19 +33,28 @@ export default function Upload() {
   async function doUpload() {
     if (!pub) return;
     if (!toUpload) return;
+    if (isUploading) return; // Prevent multiple uploads
+
     try {
       setError(undefined);
+      setIsUploading(true);
+      setUploadProgress(undefined);
+
+      const onProgress = (progress: UploadProgress) => {
+        setUploadProgress(progress);
+      };
+
       if (type === "blossom") {
         const uploader = new Blossom(url, pub);
         const result = noCompress
-          ? await uploader.upload(toUpload)
-          : await uploader.media(toUpload);
+          ? await uploader.upload(toUpload, onProgress)
+          : await uploader.media(toUpload, onProgress);
         setResults((s) => [...s, result]);
       }
       if (type === "nip96") {
         const uploader = new Nip96(url, pub);
         await uploader.loadInfo();
-        const result = await uploader.upload(toUpload);
+        const result = await uploader.upload(toUpload, onProgress);
         setResults((s) => [...s, result]);
       }
     } catch (e) {
@@ -52,6 +65,9 @@ export default function Upload() {
       } else {
         setError("Upload failed");
       }
+    } finally {
+      setIsUploading(false);
+      setUploadProgress(undefined);
     }
   }
 
@@ -184,6 +200,14 @@ export default function Upload() {
             </div>
           )}
 
+          {/* Upload Progress */}
+          {isUploading && uploadProgress && (
+            <ProgressBar 
+              progress={uploadProgress} 
+              fileName={toUpload?.name}
+            />
+          )}
+
           <div className="flex gap-4">
             <Button
               onClick={async () => {
@@ -191,15 +215,16 @@ export default function Upload() {
                 setToUpload(f);
               }}
               className="btn-secondary flex-1"
+              disabled={isUploading}
             >
               Choose File
             </Button>
             <Button
               onClick={doUpload}
-              disabled={!toUpload}
+              disabled={!toUpload || isUploading}
               className="btn-primary flex-1"
             >
-              Upload
+              {isUploading ? "Uploading..." : "Upload"}
             </Button>
           </div>
         </div>

ui_src/tsconfig.app.tsbuildinfo

@@ -1 +1 @@
-{"root":["./src/App.tsx","./src/const.ts","./src/login.ts","./src/main.tsx","./src/vite-env.d.ts","./src/components/button.tsx","./src/components/payment.tsx","./src/components/profile.tsx","./src/hooks/login.ts","./src/hooks/publisher.ts","./src/upload/admin.ts","./src/upload/blossom.ts","./src/upload/index.ts","./src/upload/nip96.ts","./src/views/admin.tsx","./src/views/files.tsx","./src/views/header.tsx","./src/views/reports.tsx","./src/views/upload.tsx"],"version":"5.6.2"}
+{"root":["./src/App.tsx","./src/const.ts","./src/login.ts","./src/main.tsx","./src/vite-env.d.ts","./src/components/button.tsx","./src/components/payment.tsx","./src/components/profile.tsx","./src/components/progress-bar.tsx","./src/hooks/login.ts","./src/hooks/publisher.ts","./src/upload/admin.ts","./src/upload/blossom.ts","./src/upload/index.ts","./src/upload/nip96.ts","./src/upload/progress.ts","./src/views/admin.tsx","./src/views/files.tsx","./src/views/header.tsx","./src/views/reports.tsx","./src/views/upload.tsx"],"version":"5.6.2"}