feat: Add ledger event as a baseclass for events with error reportingHEADnightlymaster

9 files changed, 91 insertions, 8 deletions

diff --git a/mod/src/main/kotlin/moe/nea/ledger/ItemIdProvider.kt b/mod/src/main/kotlin/moe/nea/ledger/ItemIdProvider.kt
index 0bacf32..ff2c691 100644
--- a/mod/src/main/kotlin/moe/nea/ledger/ItemIdProvider.kt
+++ b/mod/src/main/kotlin/moe/nea/ledger/ItemIdProvider.kt
@@ -20,12 +20,12 @@ class ItemIdProvider {
 	@SubscribeEvent
 	fun onMouseInput(event: GuiScreenEvent.MouseInputEvent.Pre) {
 		if (Mouse.getEventButton() == -1) return
-		MinecraftForge.EVENT_BUS.post(BeforeGuiAction(event.gui))
+		BeforeGuiAction(event.gui).post()
 	}
 
 	@SubscribeEvent
 	fun onKeyInput(event: GuiScreenEvent.KeyboardInputEvent.Pre) {
-		MinecraftForge.EVENT_BUS.post(BeforeGuiAction(event.gui))
+		BeforeGuiAction(event.gui).post()
 	}
 
 	private val knownNames = mutableMapOf<String, ItemId>()
diff --git a/mod/src/main/kotlin/moe/nea/ledger/Ledger.kt b/mod/src/main/kotlin/moe/nea/ledger/Ledger.kt
index 9bbc8e1..6d3c592 100644
--- a/mod/src/main/kotlin/moe/nea/ledger/Ledger.kt
+++ b/mod/src/main/kotlin/moe/nea/ledger/Ledger.kt
@@ -42,6 +42,7 @@ import moe.nea.ledger.modules.NpcDetection
 import moe.nea.ledger.modules.PestRepellentDetection
 import moe.nea.ledger.modules.UpdateChecker
 import moe.nea.ledger.modules.VisitorDetection
+import moe.nea.ledger.telemetry.TelemetryProvider
 import moe.nea.ledger.utils.ErrorUtil
 import moe.nea.ledger.utils.MinecraftExecutor
 import moe.nea.ledger.utils.di.DI
@@ -112,7 +113,9 @@ class Ledger {
 			tickQueue.add(runnable)
 		}
 
-		val di = DI()
+		private val di = DI()
+
+		fun leakDI() = di
 	}
 
 	@Mod.EventHandler
diff --git a/mod/src/main/kotlin/moe/nea/ledger/QueryCommand.kt b/mod/src/main/kotlin/moe/nea/ledger/QueryCommand.kt
index abdc13a..80dd54c 100644
--- a/mod/src/main/kotlin/moe/nea/ledger/QueryCommand.kt
+++ b/mod/src/main/kotlin/moe/nea/ledger/QueryCommand.kt
@@ -172,7 +172,7 @@ class QueryCommand : CommandBase() {
 		override val name: String
 			get() = "withitem"
 
-		private val itemIdProvider = Ledger.di.provide<ItemIdProvider>() // TODO: close this escape hatch
+		private val itemIdProvider = Ledger.leakDI().provide<ItemIdProvider>() // TODO: close this escape hatch
 		override fun getFilter(text: String): BooleanExpression {
 			return Clause { column(DBItemEntry.itemId) like text }
 		}
diff --git a/mod/src/main/kotlin/moe/nea/ledger/events/BeforeGuiAction.kt b/mod/src/main/kotlin/moe/nea/ledger/events/BeforeGuiAction.kt
index 098912a..7f6eae9 100644
--- a/mod/src/main/kotlin/moe/nea/ledger/events/BeforeGuiAction.kt
+++ b/mod/src/main/kotlin/moe/nea/ledger/events/BeforeGuiAction.kt
@@ -1,11 +1,21 @@
 package moe.nea.ledger.events
 
+import com.google.gson.JsonElement
+import com.google.gson.JsonObject
+import moe.nea.ledger.telemetry.GuiContextValue
+import moe.nea.ledger.utils.telemetry.ContextValue
 import net.minecraft.client.gui.GuiScreen
 import net.minecraft.client.gui.inventory.GuiChest
+import net.minecraft.client.gui.inventory.GuiContainer
 import net.minecraft.inventory.ContainerChest
 import net.minecraftforge.fml.common.eventhandler.Event
 
-data class BeforeGuiAction(val gui: GuiScreen) : Event() {
+data class BeforeGuiAction(val gui: GuiScreen) : LedgerEvent() {
 	val chest = gui as? GuiChest
 	val chestSlots = chest?.inventorySlots as ContainerChest?
+	override fun serialize(): JsonElement {
+		return JsonObject().apply {
+			add("gui", GuiContextValue(gui).serialize())
+		}
+	}
 }
diff --git a/mod/src/main/kotlin/moe/nea/ledger/events/LedgerEvent.kt b/mod/src/main/kotlin/moe/nea/ledger/events/LedgerEvent.kt
new file mode 100644
index 0000000..cbb3f81
--- /dev/null
+++ b/mod/src/main/kotlin/moe/nea/ledger/events/LedgerEvent.kt
@@ -0,0 +1,22 @@
+package moe.nea.ledger.events
+
+import moe.nea.ledger.Ledger
+import moe.nea.ledger.utils.ErrorUtil
+import moe.nea.ledger.utils.telemetry.CommonKeys
+import moe.nea.ledger.utils.telemetry.ContextValue
+import net.minecraftforge.common.MinecraftForge
+import net.minecraftforge.fml.common.eventhandler.Event
+
+abstract class LedgerEvent : Event(), ContextValue {
+	fun post() {
+		Ledger.leakDI()
+			.provide<ErrorUtil>()
+			.catch(
+				CommonKeys.EVENT_MESSAGE to ContextValue.string("Error during event execution"),
+				"event_instance" to this,
+				"event_type" to ContextValue.string(javaClass.name)
+			) {
+				MinecraftForge.EVENT_BUS.post(this)
+			}
+	}
+}
\ No newline at end of file
diff --git a/mod/src/main/kotlin/moe/nea/ledger/telemetry/GuiContextValue.kt b/mod/src/main/kotlin/moe/nea/ledger/telemetry/GuiContextValue.kt
new file mode 100644
index 0000000..2d7db39
--- /dev/null
+++ b/mod/src/main/kotlin/moe/nea/ledger/telemetry/GuiContextValue.kt
@@ -0,0 +1,16 @@
+package moe.nea.ledger.telemetry
+
+import com.google.gson.JsonElement
+import com.google.gson.JsonObject
+import moe.nea.ledger.utils.ScreenUtil
+import moe.nea.ledger.utils.telemetry.ContextValue
+import net.minecraft.client.gui.GuiScreen
+
+class GuiContextValue(val gui: GuiScreen) : ContextValue {
+	override fun serialize(): JsonElement {
+		return JsonObject().apply {
+			addProperty("class", gui.javaClass.name)
+			addProperty("name", ScreenUtil.estimateName(gui))
+		}
+	}
+}
diff --git a/mod/src/main/kotlin/moe/nea/ledger/TelemetryProvider.kt b/mod/src/main/kotlin/moe/nea/ledger/telemetry/TelemetryProvider.kt
index d9c7108..c2fff23 100644
--- a/mod/src/main/kotlin/moe/nea/ledger/TelemetryProvider.kt
+++ b/mod/src/main/kotlin/moe/nea/ledger/telemetry/TelemetryProvider.kt
@@ -1,8 +1,10 @@
-package moe.nea.ledger
+package moe.nea.ledger.telemetry
 
 import com.google.gson.JsonArray
 import com.google.gson.JsonElement
 import com.google.gson.JsonObject
+import moe.nea.ledger.DevUtil
+import moe.nea.ledger.Ledger
 import moe.nea.ledger.gen.BuildConfig
 import moe.nea.ledger.utils.di.DI
 import moe.nea.ledger.utils.di.DIProvider
@@ -40,7 +42,7 @@ object TelemetryProvider {
 	}
 
 	fun setupDefaultSpan() {
-		val sp = Span.current()
+		val sp = Span.rootSpan
 		sp.add(USER, MinecraftUser(Minecraft.getMinecraft().session))
 		sp.add(MINECRAFT_VERSION, ContextValue.compound(
 			"static" to "1.8.9",
diff --git a/mod/src/main/kotlin/moe/nea/ledger/utils/ScreenUtil.kt b/mod/src/main/kotlin/moe/nea/ledger/utils/ScreenUtil.kt
new file mode 100644
index 0000000..0305126
--- /dev/null
+++ b/mod/src/main/kotlin/moe/nea/ledger/utils/ScreenUtil.kt
@@ -0,0 +1,29 @@
+package moe.nea.ledger.utils
+
+import moe.nea.ledger.mixin.AccessorContainerDispenser
+import moe.nea.ledger.mixin.AccessorContainerHopper
+import net.minecraft.client.gui.GuiScreen
+import net.minecraft.client.gui.inventory.GuiContainer
+import net.minecraft.inventory.ContainerChest
+import net.minecraft.inventory.IInventory
+
+object ScreenUtil {
+	fun estimateInventory(screen: GuiScreen?): IInventory? {
+		if (screen !is GuiContainer) {
+			return null
+		}
+		val container = screen.inventorySlots ?: return null
+		if (container is ContainerChest)
+			return container.lowerChestInventory
+		if (container is AccessorContainerDispenser)
+			return container.dispenserInventory_ledger
+		if (container is AccessorContainerHopper)
+			return container.hopperInventory_ledger
+		return null
+
+	}
+
+	fun estimateName(screen: GuiScreen?): String? {
+		return estimateInventory(screen)?.name
+	}
+}
\ No newline at end of file
diff --git a/mod/src/main/kotlin/moe/nea/ledger/utils/telemetry/Span.kt b/mod/src/main/kotlin/moe/nea/ledger/utils/telemetry/Span.kt
index 0d680a9..8b8e284 100644
--- a/mod/src/main/kotlin/moe/nea/ledger/utils/telemetry/Span.kt
+++ b/mod/src/main/kotlin/moe/nea/ledger/utils/telemetry/Span.kt
@@ -2,9 +2,10 @@ package moe.nea.ledger.utils.telemetry
 
 class Span(val parent: Span?) : AutoCloseable {
 	companion object {
+		val rootSpan = Span(null)
 		private val _current = object : InheritableThreadLocal<Span>() {
 			override fun initialValue(): Span {
-				return Span(null)
+				return Span(rootSpan)
 			}
 
 			override fun childValue(parentValue: Span?): Span {