Properly format history timestmap

This Pr addresses #1472. When the session history is displayed
the timestmap isn't in readable form.

Author: zealsham

Cargo-minimal.lock

@@ -875,8 +875,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c673075a2e0e5f4a1dde27ce9dee1ea4558c7ffe648f576438a20ca1d2acc4b0"
 dependencies = [
  "iana-time-zone",
+ "js-sys",
  "num-traits",
  "serde",
+ "wasm-bindgen",
  "windows-link",
 ]
 
@@ -2786,6 +2788,7 @@ dependencies = [
  "anyhow",
  "async-trait",
  "bitcoind-async-client",
+ "chrono",
  "clap 4.6.0",
  "config",
  "dirs",

Cargo-recent.lock

@@ -874,13 +874,15 @@ dependencies = [
 
 [[package]]
 name = "chrono"
-version = "0.4.42"
+version = "0.4.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "145052bdd345b87320e369255277e3fb5152762ad123a901ef5c262dd38fe8d2"
+checksum = "c673075a2e0e5f4a1dde27ce9dee1ea4558c7ffe648f576438a20ca1d2acc4b0"
 dependencies = [
  "iana-time-zone",
+ "js-sys",
  "num-traits",
  "serde",
+ "wasm-bindgen",
  "windows-link 0.2.1",
 ]
 
@@ -2754,6 +2756,7 @@ dependencies = [
  "anyhow",
  "async-trait",
  "bitcoind-async-client",
+ "chrono",
  "clap 4.5.46",
  "config",
  "dirs",

payjoin-cli/Cargo.toml

@@ -29,6 +29,7 @@ v2 = ["payjoin/v2", "payjoin/io"]
 anyhow = "1.0.99"
 async-trait = "0.1.89"
 bitcoind-async-client = "0.10.2"
+chrono = "0.4.44"
 clap = { version = "4.5.45", features = ["derive"] }
 config = "0.15.14"
 dirs = "6.0.0"

payjoin-cli/src/app/v2/mod.rs

@@ -2,6 +2,7 @@ use std::fmt;
 use std::sync::{Arc, Mutex};
 
 use anyhow::{anyhow, Context, Result};
+use chrono::{DateTime, Local};
 use payjoin::bitcoin::consensus::encode::serialize_hex;
 use payjoin::bitcoin::{Amount, FeeRate};
 use payjoin::persist::{OptionalTransitionOutcome, SessionPersister};
@@ -117,6 +118,57 @@ struct SessionHistoryRow<Status> {
     error_message: Option<String>,
 }
 
+fn format_timestamps(value: &str) -> String {
+    //Prefix and suffix are used as markers to identify the timestamp in the string
+    const PREFIX: &str = "Time(Time(";
+    const SUFFIX: &str = "))";
+
+    let to_local = |secs: u64| -> String {
+        let Ok(secs) = i64::try_from(secs) else {
+            return secs.to_string();
+        };
+
+        match DateTime::from_timestamp(secs, 0) {
+            Some(datetime) =>
+                datetime.with_timezone(&Local).format("%Y-%m-%d %H:%M:%S").to_string(),
+            None => secs.to_string(),
+        }
+    };
+
+    if let Ok(secs) = value.parse::<u64>() {
+        return to_local(secs);
+    }
+
+    let mut formatted = String::with_capacity(value.len());
+    let mut remainder = value;
+
+    while let Some(start) = remainder.find(PREFIX) {
+        let (before, from_prefix) = remainder.split_at(start);
+        formatted.push_str(before);
+        let after_prefix = &from_prefix[PREFIX.len()..];
+
+        let Some(end) = after_prefix.find(SUFFIX) else {
+            formatted.push_str(from_prefix);
+            remainder = "";
+            break;
+        };
+
+        let (epoch_secs, after_match) = after_prefix.split_at(end);
+        if let Ok(secs) = epoch_secs.parse::<u64>() {
+            formatted.push_str(&format!("Time({})", to_local(secs)));
+        } else {
+            formatted.push_str(PREFIX);
+            formatted.push_str(epoch_secs);
+            formatted.push_str(SUFFIX);
+        }
+
+        remainder = &after_match[SUFFIX.len()..];
+    }
+
+    formatted.push_str(remainder);
+    formatted
+}
+
 impl<Status: StatusText> fmt::Display for SessionHistoryRow<Status> {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         write!(
@@ -126,10 +178,7 @@ impl<Status: StatusText> fmt::Display for SessionHistoryRow<Status> {
             self.role.as_str(),
             match self.completed_at {
                 None => "Not Completed".to_string(),
-                Some(secs) => {
-                    // TODO: human readable time
-                    secs.to_string()
-                }
+                Some(secs) => format_timestamps(&secs.to_string()),
             },
             self.error_message.as_deref().unwrap_or(self.status.status_text())
         )
@@ -362,7 +411,7 @@ impl AppTrait for App {
                         role: Role::Sender,
                         status: SendSession::Closed(SenderSessionOutcome::Failure),
                         completed_at: None,
-                        error_message: Some(e.to_string()),
+                        error_message: Some(format_timestamps(&e.to_string())),
                     };
                     send_rows.push(row);
                 }
@@ -388,7 +437,7 @@ impl AppTrait for App {
                         role: Role::Receiver,
                         status: ReceiveSession::Closed(ReceiverSessionOutcome::Failure),
                         completed_at: None,
-                        error_message: Some(e.to_string()),
+                        error_message: Some(format_timestamps(&e.to_string())),
                     };
                     recv_rows.push(row);
                 }
@@ -415,7 +464,7 @@ impl AppTrait for App {
                             role: Role::Sender,
                             status: SendSession::Closed(SenderSessionOutcome::Failure),
                             completed_at: Some(completed_at),
-                            error_message: Some(e.to_string()),
+                            error_message: Some(format_timestamps(&e.to_string())),
                         };
                         send_rows.push(row);
                     }
@@ -443,7 +492,7 @@ impl AppTrait for App {
                             role: Role::Receiver,
                             status: ReceiveSession::Closed(ReceiverSessionOutcome::Failure),
                             completed_at: Some(completed_at),
-                            error_message: Some(e.to_string()),
+                            error_message: Some(format_timestamps(&e.to_string())),
                         };
                         recv_rows.push(row);
                     }