Properly format history timestmap

This Pr addresses #1472. When the session history is displayed
the timestmap isn't in readable form. This Pr changes the time
from unix seconds into proper human readbale date/time.

Author: zealsham

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

@@ -96,6 +96,44 @@ fn print_header() {
     );
 }
 
+/// Format a Unix timestamp (seconds since epoch) as `YYYY-MM-DD HH:MM:SS`
+/// using Howard Hinnant's civil_from_days algorithm — no external dependencies.
+fn format_unix_secs(secs: u64) -> String {
+    fn civil_from_days(z: i64) -> (i32, u32, u32) {
+        let z = z + 719_468;
+        let era = if z >= 0 { z } else { z - 146_096 } / 146_097;
+        let doe = (z - era * 146_097) as u64;
+        let yoe = (doe - doe / 1460 + doe / 36524 - doe / 146_096) / 365;
+        let y = yoe as i64 + era * 400;
+        let doy = doe - (365 * yoe + yoe / 4 - yoe / 100);
+        let mp = (5 * doy + 2) / 153;
+        let d = doy - (153 * mp + 2) / 5 + 1;
+        let m = if mp < 10 { mp + 3 } else { mp - 9 };
+        let y = if m <= 2 { y + 1 } else { y };
+        (y as i32, m as u32, d as u32)
+    }
+
+    let days = (secs / 86_400) as i64;
+    let tod = secs % 86_400;
+    let (year, month, day) = civil_from_days(days);
+    format!("{:04}-{:02}-{:02} {:02}:{:02}:{:02}", year, month, day, tod / 3600, (tod % 3600) / 60, tod % 60)
+}
+
+/// Reformat error messages that contain a raw `Time(Time(timestamp))` debug repr,
+/// replacing the opaque token with a human-readable UTC datetime.
+fn format_session_error(msg: &str) -> String {
+    const PREFIX: &str = "Session expired at Time(Time(";
+    const SUFFIX: &str = "))";
+    if let Some(rest) = msg.strip_prefix(PREFIX) {
+        if let Some(num_str) = rest.strip_suffix(SUFFIX) {
+            if let Ok(secs) = num_str.parse::<u64>() {
+                return format!("Session expired at {} UTC", format_unix_secs(secs));
+            }
+        }
+    }
+    msg.to_string()
+}
+
 enum Role {
     Sender,
     Receiver,
@@ -113,7 +151,7 @@ struct SessionHistoryRow<Status> {
     session_id: SessionId,
     role: Role,
     status: Status,
-    completed_at: Option<u64>,
+    completed_at: Option<String>,
     error_message: Option<String>,
 }
 
@@ -124,13 +162,7 @@ impl<Status: StatusText> fmt::Display for SessionHistoryRow<Status> {
             "{:<W_ID$} {:<W_ROLE$} {:<W_DONE$} {:<W_STATUS$}",
             self.session_id.to_string(),
             self.role.as_str(),
-            match self.completed_at {
-                None => "Not Completed".to_string(),
-                Some(secs) => {
-                    // TODO: human readable time
-                    secs.to_string()
-                }
-            },
+            self.completed_at.as_deref().unwrap_or("Not Completed"),
             self.error_message.as_deref().unwrap_or(self.status.status_text())
         )
     }
@@ -362,7 +394,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_session_error(&e.to_string())),
                     };
                     send_rows.push(row);
                 }
@@ -388,7 +420,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_session_error(&e.to_string())),
                     };
                     recv_rows.push(row);
                 }
@@ -415,7 +447,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_session_error(&e.to_string())),
                         };
                         send_rows.push(row);
                     }
@@ -443,7 +475,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_session_error(&e.to_string())),
                         };
                         recv_rows.push(row);
                     }

payjoin-cli/src/db/v2.rs

@@ -230,14 +230,15 @@ impl Database {
         Ok(HpkePublicKey::from_compressed_bytes(&receiver_pubkey).expect("Valid receiver pubkey"))
     }
 
-    pub(crate) fn get_inactive_send_session_ids(&self) -> Result<Vec<(SessionId, u64)>> {
+    pub(crate) fn get_inactive_send_session_ids(&self) -> Result<Vec<(SessionId, String)>> {
         let conn = self.get_connection()?;
         let mut stmt = conn.prepare(
-            "SELECT session_id, completed_at FROM send_sessions WHERE completed_at IS NOT NULL",
+            "SELECT session_id, strftime('%Y-%m-%d %H:%M:%S', completed_at, 'unixepoch') \
+             FROM send_sessions WHERE completed_at IS NOT NULL",
         )?;
         let session_rows = stmt.query_map([], |row| {
             let session_id: i64 = row.get(0)?;
-            let completed_at: u64 = row.get(1)?;
+            let completed_at: String = row.get(1)?;
             Ok((SessionId(session_id), completed_at))
         })?;
 
@@ -249,14 +250,15 @@ impl Database {
         Ok(session_ids)
     }
 
-    pub(crate) fn get_inactive_recv_session_ids(&self) -> Result<Vec<(SessionId, u64)>> {
+    pub(crate) fn get_inactive_recv_session_ids(&self) -> Result<Vec<(SessionId, String)>> {
         let conn = self.get_connection()?;
         let mut stmt = conn.prepare(
-            "SELECT session_id, completed_at FROM receive_sessions WHERE completed_at IS NOT NULL",
+            "SELECT session_id, strftime('%Y-%m-%d %H:%M:%S', completed_at, 'unixepoch') \
+             FROM receive_sessions WHERE completed_at IS NOT NULL",
         )?;
         let session_rows = stmt.query_map([], |row| {
             let session_id: i64 = row.get(0)?;
-            let completed_at: u64 = row.get(1)?;
+            let completed_at: String = row.get(1)?;
             Ok((SessionId(session_id), completed_at))
         })?;