Merge pull request #413 from sarub0b0/retry-resume-logs

Support retry and resume for log streaming

cspell.json

@@ -1,62 +1 @@
-{
-  "words": [
-    "ratatui",
-    "crossterm",
-    "kubetui",
-    "Atext",
-    "multispace",
-    "nums",
-    "arboard",
-    "kohashimoto",
-    "kubeconfig",
-    "hoge",
-    "rstest",
-    "thiserror",
-    "openapi",
-    "Kubeconfig",
-    "indoc",
-    "apimachinery",
-    "horizontalpodautoscalers",
-    "mockall",
-    "configmap",
-    "chrono",
-    "networkpolicies",
-    "networkpolicy",
-    "serviceaccount",
-    "jdfbz",
-    "tolerations",
-    "pullable",
-    "fuga",
-    "coldef",
-    "Appender",
-    "logfile",
-    "appender",
-    "Fullscreen",
-    "activatable",
-    "rustfmt",
-    "tesat",
-    "tesatb",
-    "fullwidth",
-    "mabb",
-    "peekable",
-    "taskbox",
-    "ptimized",
-    "mhoge",
-    "oneline",
-    "maaaaaaaaaaaaaaa",
-    "impls",
-    "showable",
-    "mabc",
-    "HOGE",
-    "hogehoge",
-    "subwin",
-    "erde",
-    "rustls",
-    "taplo",
-    "kosay",
-    "serde"
-  ],
-  "language": "en",
-  "version": "0.2",
-  "flagWords": []
-}
+{"language":"en","version":"0.2","words":["ratatui","crossterm","kubetui","Atext","multispace","nums","arboard","kohashimoto","kubeconfig","hoge","rstest","thiserror","openapi","Kubeconfig","indoc","apimachinery","horizontalpodautoscalers","mockall","configmap","chrono","networkpolicies","networkpolicy","serviceaccount","jdfbz","tolerations","pullable","fuga","coldef","Appender","logfile","appender","Fullscreen","activatable","rustfmt","tesat","tesatb","fullwidth","mabb","peekable","taskbox","ptimized","mhoge","oneline","maaaaaaaaaaaaaaa","impls","showable","mabc","HOGE","hogehoge","subwin","erde","rustls","taplo","kosay","serde","itertools"],"flagWords":[]}

rustfmt.toml

@@ -0,0 +1,2 @@
+force_multiline_blocks = true
+imports_layout = "HorizontalVertical"

src/event/kubernetes.rs

@@ -39,7 +39,7 @@ use self::{
     config::{ConfigMessage, ConfigsDataWorker},
     context_message::{ContextMessage, ContextRequest, ContextResponse},
     inner::Inner,
-    log::{LogHandlers, LogStreamMessage, LogWorkerBuilder},
+    log::{LogHandlers, LogStreamMessage, LogWorker},
     namespace_message::{NamespaceMessage, NamespaceRequest, NamespaceResponse},
     network::{NetworkDescriptionWorker, NetworkMessage},
     worker::{PollWorker, Worker},
@@ -393,11 +393,8 @@ impl Worker for MainWorker {
                             handler.abort();
                         }
 
-                        log_stream_handler = Some(
-                            LogWorkerBuilder::new(tx, kube_client.clone(), namespace, name)
-                                .build()
-                                .spawn(),
-                        );
+                        log_stream_handler =
+                            Some(LogWorker::new(tx, kube_client.clone(), namespace, name).spawn());
 
                         task::yield_now().await;
                     }
@@ -1016,7 +1013,9 @@ mod kube_store {
                     });
 
                     let user = auth_infos.iter().find_map(|auth_info| {
-                        let Some(kube::config::Context{ref user, ..}) = context.context else {return None};
+                        let Some(kube::config::Context { ref user, .. }) = context.context else {
+                            return None;
+                        };
 
                         if &auth_info.name == user {
                             Some(auth_info.name.to_string())

src/event/kubernetes/api_resources.rs

@@ -168,7 +168,7 @@ impl Ord for ApiResource {
 
 impl PartialOrd for ApiResource {
     fn partial_cmp(&self, other: &Self) -> Option<std::cmp::Ordering> {
-        self.to_string().partial_cmp(&other.to_string())
+        Some(self.cmp(other))
     }
 }
 

src/event/kubernetes/client.rs

@@ -44,6 +44,10 @@ impl KubeClient {
         &self.client
     }
 
+    pub fn to_client(&self) -> Client {
+        self.client.clone()
+    }
+
     #[allow(dead_code)]
     pub fn as_server_url(&self) -> &String {
         &self.server_url

src/event/kubernetes/color.rs

@@ -1,4 +1,43 @@
-const COLOR: [u8; 6] = [32, 33, 34, 35, 36, 37];
+pub mod fg {
+
+    #[allow(dead_code)]
+    #[derive(Clone, Copy)]
+    pub enum Color {
+        Reset = 39,
+
+        Red = 31,
+        Green = 32,
+        Yellow = 33,
+        Blue = 34,
+        Magenta = 35,
+        Cyan = 36,
+        Gray = 37,
+
+        DarkGray = 90,
+        LightRed = 91,
+        LightGreen = 92,
+        LightYellow = 93,
+        LightBlue = 94,
+        LightMagenta = 95,
+        LightCyan = 96,
+        White = 97,
+    }
+
+    impl Color {
+        pub fn wrap(&self, s: impl Into<String>) -> String {
+            format!("\x1b[{}m{}\x1b[39m", *self as u8, s.into())
+        }
+    }
+}
+
+const COLOR: [u8; 6] = [
+    fg::Color::Green as u8,
+    fg::Color::Yellow as u8,
+    fg::Color::Blue as u8,
+    fg::Color::Magenta as u8,
+    fg::Color::Cyan as u8,
+    fg::Color::Gray as u8,
+];
 
 pub struct Color {
     index: usize,