fix: codeflare dump should support -f/--follow

Author: starpit

plugins/plugin-codeflare-dashboard/src/controller/dashboard/tailf.ts

@@ -34,7 +34,7 @@ function waitTillExists(filepath: string) {
   })
 }
 
-async function initTail(filepath: string): Promise<Tail> {
+async function initTail(filepath: string, split = true): Promise<Tail> {
   await waitTillExists(filepath)
 
   return new Promise<Tail>((resolve, reject) => {
@@ -47,7 +47,7 @@ async function initTail(filepath: string): Promise<Tail> {
     tail.start()
 
     resolve({
-      stream: tail.pipe(split2()),
+      stream: split ? tail.pipe(split2()) : tail,
       quit: tail.quit.bind(tail),
     })
   })
@@ -60,6 +60,11 @@ export async function pathsFor(kind: Kind, profile: string, jobId: string) {
   )
 }
 
-export default async function tailf(kind: Kind, profile: string, jobId: string): Promise<Promise<Tail>[]> {
-  return pathsFor(kind, profile, jobId).then((_) => _.map(initTail))
+export default async function tailf(
+  kind: Kind,
+  profile: string,
+  jobId: string,
+  split = true
+): Promise<Promise<Tail>[]> {
+  return pathsFor(kind, profile, jobId).then((_) => _.map((filepath) => initTail(filepath, split)))
 }

plugins/plugin-codeflare-dashboard/src/controller/dump.ts

@@ -18,35 +18,65 @@ import { Arguments } from "@kui-shell/core"
 
 import { pathsFor } from "./dashboard/tailf.js"
 import { isValidKind } from "./dashboard/kinds.js"
-import { Options, jobIdFrom, usage } from "./dashboard/index.js"
+import { Options as DashboardOptions, jobIdFrom, usage as dbUsage } from "./dashboard/index.js"
+
+export type Options = DashboardOptions & {
+  f: boolean
+  follow: boolean
+}
+
+export const flags = {
+  boolean: ["follow"],
+  alias: { follow: ["f"] },
+}
+
+function usage() {
+  return dbUsage("dump") + " [-f/--follow]"
+}
 
 export default async function dump(args: Arguments<Options>) {
   const kind = args.argvNoOptions[args.argvNoOptions.indexOf("dump") + 1]
   const { jobId, profile } = await jobIdFrom(args, "dump")
 
   if (!isValidKind(kind)) {
-    throw new Error(usage("dump"))
+    throw new Error(usage())
   } else if (!jobId) {
-    throw new Error(usage("dump"))
+    throw new Error(usage())
   }
 
-  const { createReadStream } = await import("fs")
-  await Promise.all(
-    (
-      await pathsFor(kind, profile, jobId)
-    ).map(
-      (filepath) =>
-        new Promise((resolve, reject) => {
-          try {
-            const rs = createReadStream(filepath)
-            rs.on("close", resolve)
-            rs.pipe(process.stdout)
-          } catch (err) {
-            reject(err)
-          }
-        })
+  if (!args.parsedOptions.f) {
+    const { createReadStream } = await import("fs")
+    await Promise.all(
+      (
+        await pathsFor(kind, profile, jobId)
+      ).map(
+        (filepath) =>
+          new Promise((resolve, reject) => {
+            try {
+              const rs = createReadStream(filepath)
+              rs.on("close", resolve)
+              rs.pipe(process.stdout)
+            } catch (err) {
+              reject(err)
+            }
+          })
+      )
     )
-  )
+  } else {
+    const once = async () => {
+      const tails = await import("./dashboard/tailf.js").then((_) => _.default(kind, profile, jobId, false))
+      await Promise.all(tails.map((_) => _.then((_) => _.stream.pipe(process.stdout))))
+      await Promise.all(tails.map((_) => new Promise((resolve) => _.then((_) => _.stream.on("close", resolve)))))
+      return true
+    }
+
+    try {
+      return once()
+    } catch (err) {
+      await new Promise((resolve) => setTimeout(resolve, 2000))
+      once()
+    }
+  }
 
   return true
 }

plugins/plugin-codeflare-dashboard/src/plugin.ts

@@ -18,6 +18,7 @@ import { KResponse, Registrar } from "@kui-shell/core"
 
 import { flags } from "./controller/dashboard/options.js"
 import type { Options as DashboardOptions } from "./controller/dashboard/index.js"
+import { Options as DumpOptions, flags as dumpFlags } from "./controller/dump.js"
 
 /** Register Kui Commands */
 export default function registerCodeflareCommands(registrar: Registrar) {
@@ -29,7 +30,9 @@ export default function registerCodeflareCommands(registrar: Registrar) {
     )
   )
 
-  registrar.listen<KResponse, DashboardOptions>("/codeflare/dump", (args) =>
-    import("./controller/dump.js").then((_) => _.default(args))
+  registrar.listen<KResponse, DumpOptions>(
+    "/codeflare/dump",
+    (args) => import("./controller/dump.js").then((_) => _.default(args)),
+    { flags: dumpFlags }
   )
 }