Implement external JAR class loading for log parsers and log buffer selection for device logs

Author: Gegenbauer

app/build.gradle.kts

@@ -34,10 +34,6 @@ dependencies {
     testImplementation(Mockk.mockk)
 }
 
-tasks.test {
-    useJUnitPlatform()
-}
-
 // TODO 更改应用安装后的图标
 compose.desktop {
     application {

app/proguard-rules.pro

@@ -3,6 +3,10 @@
 -keep class me.gegenbauer.catspy.view.combobox.FilterComboBox { *; }
 -keep class me.gegenbauer.catspy.view.combobox.FilterComboBoxModel { *; }
 -keep class me.gegenbauer.catspy.log.ui.table.SplitLogPane { *; }
+-keep class me.gegenbauer.catspy.log.LogParser { *; }
+-keep class me.gegenbauer.catspy.log.parse.* { *; }
+-keep class me.gegenbauer.catspy.log.LogParser$ParseMetadata { *; }
+-keep class me.gegenbauer.catspy.log.SequenceLogParser { *; }
 # CatSpy End
 
 # occupies 9.3mb
@@ -97,4 +101,9 @@
 
 # jna Start
 -keep class com.sun.jna.** { *; }
-# jna End
+# jna End
+
+# classgraph Start
+-keep class nonapi.io.github.classgraph.** { *; }
+-keep class io.github.classgraph.** { *; }
+# classgraph End

app/src/main/kotlin/me/gegenbauer/catspy/ui/MainFrame.kt

@@ -1,13 +1,7 @@
 package me.gegenbauer.catspy.ui
 
 import kotlinx.coroutines.*
-import me.gegenbauer.catspy.concurrency.FileSaveEvent
-import me.gegenbauer.catspy.concurrency.GIO
-import me.gegenbauer.catspy.concurrency.GlobalEventManager
-import me.gegenbauer.catspy.concurrency.GlobalMessageManager
-import me.gegenbauer.catspy.concurrency.Message
-import me.gegenbauer.catspy.concurrency.NormalEvent
-import me.gegenbauer.catspy.concurrency.OpenAdbPathSettingsEvent
+import me.gegenbauer.catspy.concurrency.*
 import me.gegenbauer.catspy.conf.GlobalConfSync
 import me.gegenbauer.catspy.configuration.SettingsManager
 import me.gegenbauer.catspy.configuration.currentSettings
@@ -20,8 +14,8 @@ import me.gegenbauer.catspy.ddmlib.adb.AdbConf
 import me.gegenbauer.catspy.ddmlib.device.AdamDeviceMonitor
 import me.gegenbauer.catspy.glog.GLog
 import me.gegenbauer.catspy.iconset.appIcons
-import me.gegenbauer.catspy.java.ext.*
-import me.gegenbauer.catspy.log.metadata.LogMetadataManager
+import me.gegenbauer.catspy.java.ext.EMPTY_STRING
+import me.gegenbauer.catspy.java.ext.KotlinReflectionPreTrigger
 import me.gegenbauer.catspy.network.update.ReleaseEvent
 import me.gegenbauer.catspy.platform.currentPlatform
 import me.gegenbauer.catspy.strings.STRINGS
@@ -81,7 +75,7 @@ class MainFrame(
 
         preTriggerKotlinReflection()
 
-        loadLogMetadata()
+        loadData()
     }
 
     private fun createUI() {
@@ -151,12 +145,8 @@ class MainFrame(
         }
     }
 
-    private fun loadLogMetadata() {
-        scope.launch {
-            withContext(Dispatchers.GIO) {
-                ServiceManager.getContextService(LogMetadataManager::class.java).loadAllMetadata()
-            }
-        }
+    private fun loadData() {
+        mainViewModel.loadData()
     }
 
     private fun observeEventFlow() {

app/src/main/kotlin/me/gegenbauer/catspy/ui/MainViewModel.kt

@@ -3,6 +3,8 @@ package me.gegenbauer.catspy.ui
 import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
+import kotlinx.coroutines.async
+import kotlinx.coroutines.awaitAll
 import kotlinx.coroutines.channels.BufferOverflow
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.SharedFlow
@@ -22,6 +24,8 @@ import me.gegenbauer.catspy.context.MemoryState
 import me.gegenbauer.catspy.context.ServiceManager
 import me.gegenbauer.catspy.file.appendPath
 import me.gegenbauer.catspy.glog.GLog
+import me.gegenbauer.catspy.log.metadata.LogMetadataManager
+import me.gegenbauer.catspy.log.parse.ParserManager
 import me.gegenbauer.catspy.network.update.GithubUpdateServiceFactory
 import me.gegenbauer.catspy.network.update.ReleaseEvent
 import me.gegenbauer.catspy.network.update.data.Release
@@ -79,7 +83,10 @@ class MainViewModel(override val contexts: Contexts = Contexts.default) : Contex
         scope.launch {
             val latestReleaseResult = updateService.getLatestRelease()
             if (latestReleaseResult.isFailure) {
-                GLog.w(TAG, "[checkUpdate] failed to get latest release, error=${latestReleaseResult.exceptionOrNull()}")
+                GLog.w(
+                    TAG,
+                    "[checkUpdate] failed to get latest release, error=${latestReleaseResult.exceptionOrNull()}"
+                )
                 if (force) {
                     _eventFlow.emit(ReleaseEvent.ErrorEvent(latestReleaseResult.exceptionOrNull()))
                 }
@@ -145,7 +152,10 @@ class MainViewModel(override val contexts: Contexts = Contexts.default) : Contex
         return withContext(Dispatchers.GIO) {
             val logFile = getLastModifiedLog()
             logFile?.let { sourceFile ->
-                GLog.d(TAG, "[exportLog] targetLogFile=${targetFile.absolutePath}, sourceLogFile=${sourceFile.absolutePath}")
+                GLog.d(
+                    TAG,
+                    "[exportLog] targetLogFile=${targetFile.absolutePath}, sourceLogFile=${sourceFile.absolutePath}"
+                )
 
                 val taskName = STRINGS.ui.exportFileTaskTitle.get(targetFile.absolutePath)
                 val task = Task(taskName, object : TaskHandle {
@@ -176,6 +186,21 @@ class MainViewModel(override val contexts: Contexts = Contexts.default) : Contex
         }
     }
 
+    fun loadData() {
+        scope.launch {
+            listOf(
+                async {
+                    val logMetadataManager = ServiceManager.getContextService(LogMetadataManager::class.java)
+                    logMetadataManager.loadAllMetadata()
+                },
+                async {
+                    val parserManager = ServiceManager.getContextService(ParserManager::class.java)
+                    parserManager.loadParsers()
+                }
+            ).awaitAll()
+        }
+    }
+
     private fun stopMemoryMonitor() {
         memoryMonitorJob?.cancel()
     }

build.gradle.kts

@@ -1,4 +1,5 @@
-// build.gradle.kts 文件
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
 plugins {
     // this is necessary to avoid the plugins to be loaded multiple times
     // in each subproject's classloader
@@ -15,4 +16,12 @@ allprojects {
         mavenCentral()
         maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
     }
+
+    tasks.withType<KotlinCompile> {
+        kotlinOptions {
+            jvmTarget = "17"
+            freeCompilerArgs += "-Xdebug"
+            freeCompilerArgs += "-opt-in=kotlin.RequiresOptIn"
+        }
+    }
 }

buildSrc/src/main/kotlin/VersionManagement.kt

@@ -145,6 +145,13 @@ object Oshi {
     val oshiCore = Dependency(GROUP_NAME, "oshi-core", VERSION)
 }
 
+object ClassGraph {
+    private const val GROUP_NAME = "io.github.classgraph"
+    private const val VERSION = "4.8.179"
+
+    val classGraph = Dependency(GROUP_NAME, "classgraph", VERSION)
+}
+
 data class Dependency(
     val group: String,
     val artifact: String,

cache/src/test/kotlin/me/gegenbauer/catspy/cache/PatternProviderTest.kt

@@ -21,7 +21,7 @@ class PatternProviderTest {
     }
 
     @Test
-    fun `should return cached pattern when requested key is alreaady in cache`() {
+    fun `should return cached pattern when requested key is already in cache`() {
         // Given
         val patternProvider = PatternProvider()
         val patternKey = PatternKey("test")

catspy-log-parser.jar

@@ -9,11 +9,4 @@ dependencies {
     implementation(projects.javaext)
     api(Kotlin.coroutineCore)
     api(Kotlin.coroutineSwing)
-}
-
-tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
-    kotlinOptions {
-        jvmTarget = "17"
-        freeCompilerArgs += "-opt-in=kotlin.RequiresOptIn"
-    }
 }

concurrency/build.gradle.kts

@@ -24,6 +24,10 @@ class IgnoreFastCallbackScheduler(
     }
 
     override fun cancel() {
+        job?.cancel()
+    }
+
+    override fun destroy() {
         scope.cancel()
     }
 }
@@ -32,6 +36,8 @@ interface CallbackSchedule {
     fun schedule(callback: Callback)
 
     fun cancel()
+
+    fun destroy()
 }
 
 fun interface Callback {