Add commands (#19)

d10xa · web-flow · commit dbd2d34c352d · 2024-12-08T20:54:24.000+03:00
* Add commands
diff --git a/json-log-viewer/js/src/main/scala/ru/d10xa/jsonlogviewer/shell/ShellImpl.scala b/json-log-viewer/js/src/main/scala/ru/d10xa/jsonlogviewer/shell/ShellImpl.scala
@@ -0,0 +1,12 @@
+package ru.d10xa.jsonlogviewer.shell
+
+import cats.effect.*
+import fs2.*
+
+import java.io.*
+
+class ShellImpl extends Shell {
+
+  def mergeCommands(commands: List[String]): Stream[IO, String] = Stream.empty
+
+}
diff --git a/json-log-viewer/jvm/src/main/scala/ru/d10xa/jsonlogviewer/decline/ConfigInitImpl.scala b/json-log-viewer/jvm/src/main/scala/ru/d10xa/jsonlogviewer/decline/ConfigInitImpl.scala
@@ -47,7 +47,8 @@ class ConfigInitImpl extends ConfigInit {
         c.copy(
           filter = c.filter.orElse(config.filter),
           formatIn =
-            c.formatIn.orElse(config.formatIn).orElse(Some(FormatIn.Json))
+            c.formatIn.orElse(config.formatIn).orElse(Some(FormatIn.Json)),
+          configYaml = Some(config)
         )
       case None => c
     }
diff --git a/json-log-viewer/jvm/src/main/scala/ru/d10xa/jsonlogviewer/shell/ShellImpl.scala b/json-log-viewer/jvm/src/main/scala/ru/d10xa/jsonlogviewer/shell/ShellImpl.scala
@@ -0,0 +1,37 @@
+package ru.d10xa.jsonlogviewer.shell
+
+import cats.effect.*
+import fs2.*
+
+import java.io.*
+
+class ShellImpl extends Shell {
+
+  def createProcess(command: String): Resource[IO, Process] =
+    Resource.make(IO {
+      new ProcessBuilder("sh", "-c", command)
+        .redirectErrorStream(true)
+        .start()
+    })(process => IO(process.destroy()).void)
+
+  def runInfiniteCommand(command: String): Stream[IO, String] =
+    Stream.resource(createProcess(command)).flatMap { process =>
+      fs2.io
+        .readInputStream(
+          IO(process.getInputStream),
+          4096,
+          closeAfterUse = false
+        )
+        .through(text.utf8.decode)
+        .through(text.lines)
+        .onFinalize(IO {
+          process.waitFor()
+        }.void)
+    }
+
+  def mergeCommands(commands: List[String]): Stream[IO, String] = {
+    val streams = commands.map(runInfiniteCommand)
+    Stream.emits(streams).parJoin(math.max(1, commands.length))
+  }
+
+}
diff --git a/json-log-viewer/shared/src/main/scala/ru/d10xa/jsonlogviewer/Application.scala b/json-log-viewer/shared/src/main/scala/ru/d10xa/jsonlogviewer/Application.scala
@@ -15,6 +15,7 @@ import cats.syntax.all.*
 import ru.d10xa.jsonlogviewer.decline.ConfigInit
 import ru.d10xa.jsonlogviewer.decline.ConfigInitImpl
 import ru.d10xa.jsonlogviewer.decline.ConfigYaml
+import ru.d10xa.jsonlogviewer.shell.ShellImpl
 
 object Application
   extends CommandIOApp(
@@ -37,8 +38,14 @@ object Application
           case Some(FormatIn.Logfmt) => LogfmtLogLineParser(updatedConfig)
           case _ => JsonLogLineParser(updatedConfig, jsonPrefixPostfix)
         }
-
-        stdinLinesStream
+        val commandsOpt = updatedConfig.configYaml.flatMap(_.commands).filter(_.nonEmpty)
+        val stream = commandsOpt match {
+          case Some(cmds) if cmds.nonEmpty =>
+            new ShellImpl().mergeCommands(cmds)
+          case _ =>
+            stdinLinesStream
+        }
+        stream
           .through(LogViewerStream.stream[IO](updatedConfig, logLineParser))
           .through(text.utf8.encode)
           .through(io.stdout)
diff --git a/json-log-viewer/shared/src/main/scala/ru/d10xa/jsonlogviewer/decline/Config.scala b/json-log-viewer/shared/src/main/scala/ru/d10xa/jsonlogviewer/decline/Config.scala
@@ -10,6 +10,7 @@ import scala.util.matching.Regex
 
 final case class Config(
   configFile: Option[ConfigFile],
+  configYaml: Option[ConfigYaml],
   timestamp: TimestampConfig,
   grep: List[ConfigGrep],
   filter: Option[QueryAST],
diff --git a/json-log-viewer/shared/src/main/scala/ru/d10xa/jsonlogviewer/decline/ConfigYaml.scala b/json-log-viewer/shared/src/main/scala/ru/d10xa/jsonlogviewer/decline/ConfigYaml.scala
@@ -4,5 +4,9 @@ import ru.d10xa.jsonlogviewer.query.QueryAST
 
 case class ConfigYaml(
   filter: Option[QueryAST],
-  formatIn: Option[Config.FormatIn]
+  formatIn: Option[Config.FormatIn],
+  commands: Option[List[String]]
 )
+
+object ConfigYaml:
+  val empty: ConfigYaml = ConfigYaml(None, None, None)
diff --git a/json-log-viewer/shared/src/main/scala/ru/d10xa/jsonlogviewer/decline/ConfigYamlLoader.scala b/json-log-viewer/shared/src/main/scala/ru/d10xa/jsonlogviewer/decline/ConfigYamlLoader.scala
@@ -16,7 +16,7 @@ object ConfigYamlLoader {
       .mkString("\n")
       .trim
     if (uncommentedContent.isEmpty) {
-      Validated.valid(ConfigYaml(None, None))
+      Validated.valid(ConfigYaml.empty)
     } else {
       parser.parse(content) match {
         case Left(error) =>
@@ -61,8 +61,20 @@ object ConfigYamlLoader {
                     }
                   case None => Validated.valid(None)
                 }
+              val commandsValidated: ValidatedNel[String, Option[List[String]]] =
+                fields.get("commands") match {
+                  case Some(jsonValue) =>
+                    jsonValue.as[List[String]] match {
+                      case Left(_) =>
+                        Validated.invalidNel("Invalid 'commands' field format")
+                      case Right(cmds) =>
+                        Validated.valid(Some(cmds))
+                    }
+                  case None => Validated.valid(None)
+                }
 
-              (filterValidated, formatInValidated).mapN(ConfigYaml.apply)
+              (filterValidated, formatInValidated, commandsValidated)
+                .mapN(ConfigYaml.apply)
           }
       }
     }
diff --git a/json-log-viewer/shared/src/main/scala/ru/d10xa/jsonlogviewer/decline/DeclineOpts.scala b/json-log-viewer/shared/src/main/scala/ru/d10xa/jsonlogviewer/decline/DeclineOpts.scala
@@ -47,7 +47,7 @@ object DeclineOpts {
     .option[String]("format-in", help = "json, logfmt")
     .mapValidated(FormatInValidator.toValidatedFormatIn)
     .orNone
-  
+
   val formatOut: Opts[Option[FormatOut]] = Opts
     .option[String]("format-out", help = "pretty, raw")
     .mapValidated(FormatOutValidator.toValidatedFormatOut)
@@ -64,7 +64,25 @@ object DeclineOpts {
 
   val config: Opts[Config] =
     (configFile, timestampConfig, grepConfig, filterConfig, formatIn, formatOut)
-      .mapN(Config.apply)
+      .mapN {
+        case (
+            configFile,
+            timestampConfig,
+            grepConfig,
+            filterConfig,
+            formatIn,
+            formatOut
+          ) =>
+          Config(
+            configFile = configFile,
+            configYaml = None,
+            timestamp = timestampConfig,
+            grep = grepConfig,
+            filter = filterConfig,
+            formatIn = formatIn,
+            formatOut = formatOut
+          )
+      }
 
   val command: Command[Config] = Command(
     name = "json-log-viewer",
diff --git a/json-log-viewer/shared/src/main/scala/ru/d10xa/jsonlogviewer/shell/Shell.scala b/json-log-viewer/shared/src/main/scala/ru/d10xa/jsonlogviewer/shell/Shell.scala
@@ -0,0 +1,7 @@
+package ru.d10xa.jsonlogviewer.shell
+import fs2.*
+import cats.effect.*
+
+trait Shell {
+  def mergeCommands(commands: List[String]): Stream[IO, String]
+}
diff --git a/json-log-viewer/shared/src/test/scala/ru/d10xa/jsonlogviewer/query/LogLineQueryPredicateImplTest.scala b/json-log-viewer/shared/src/test/scala/ru/d10xa/jsonlogviewer/query/LogLineQueryPredicateImplTest.scala
@@ -83,6 +83,7 @@ class LogLineQueryPredicateImplTest extends munit.FunSuite {
 
   private val config: Config = Config(
     configFile = None,
+    configYaml = None,
     timestamp = TimestampConfig(
       fieldName = "@timestamp",
       None,

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,8 @@ class ConfigInitImpl extends ConfigInit {`
`47`	`47`	`c.copy(`
`48`	`48`	`filter = c.filter.orElse(config.filter),`
`49`	`49`	`formatIn =`
`50`		`- c.formatIn.orElse(config.formatIn).orElse(Some(FormatIn.Json))`
	`50`	`+ c.formatIn.orElse(config.formatIn).orElse(Some(FormatIn.Json)),`
	`51`	`+ configYaml = Some(config)`
`51`	`52`	`)`
`52`	`53`	`case None => c`
`53`	`54`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ object ConfigYamlLoader {`
`16`	`16`	`.mkString("\n")`
`17`	`17`	`.trim`
`18`	`18`	`if (uncommentedContent.isEmpty) {`
`19`		`- Validated.valid(ConfigYaml(None, None))`
	`19`	`+ Validated.valid(ConfigYaml.empty)`
`20`	`20`	`} else {`
`21`	`21`	`parser.parse(content) match {`
`22`	`22`	`case Left(error) =>`
`@@ -61,8 +61,20 @@ object ConfigYamlLoader {`
`61`	`61`	`}`
`62`	`62`	`case None => Validated.valid(None)`
`63`	`63`	`}`
	`64`	`+ val commandsValidated: ValidatedNel[String, Option[List[String]]] =`
	`65`	`+ fields.get("commands") match {`
	`66`	`+ case Some(jsonValue) =>`
	`67`	`+ jsonValue.as[List[String]] match {`
	`68`	`+ case Left(_) =>`
	`69`	`+ Validated.invalidNel("Invalid 'commands' field format")`
	`70`	`+ case Right(cmds) =>`
	`71`	`+ Validated.valid(Some(cmds))`
	`72`	`+ }`
	`73`	`+ case None => Validated.valid(None)`
	`74`	`+ }`
`64`	`75`
`65`		`- (filterValidated, formatInValidated).mapN(ConfigYaml.apply)`
	`76`	`+ (filterValidated, formatInValidated, commandsValidated)`
	`77`	`+ .mapN(ConfigYaml.apply)`
`66`	`78`	`}`
`67`	`79`	`}`
`68`	`80`	`}`