From 8cfed83e02ac9e4b3c3640e80a780ed85fef8375 Mon Sep 17 00:00:00 2001 From: Ketan Reddy Date: Thu, 15 Oct 2026 12:33:48 -0700 Subject: [PATCH 1/2] Fix a handful of minor bugs with the JVM implementation. --- devtools/messenger/jvm/api/messenger.api | 67 +++++++++++++------ .../com/intuit/playerui/devtools/Event.kt | 11 +++ .../com/intuit/playerui/devtools/Messenger.kt | 11 ++- .../intuit/playerui/devtools/MessengerTest.kt | 20 ++++++ .../playerui/devtools/DevtoolsPlugin.kt | 3 +- .../playerui/devtools/DevtoolsPluginTest.kt | 49 ++++++++++++++ 6 files changed, 138 insertions(+), 23 deletions(-) diff --git a/devtools/messenger/jvm/api/messenger.api b/devtools/messenger/jvm/api/messenger.api index 31d5eea..69737a4 100755 --- a/devtools/messenger/jvm/api/messenger.api +++ b/devtools/messenger/jvm/api/messenger.api @@ -1,18 +1,21 @@ public final class com/intuit/playerui/devtools/BeaconEvent : com/intuit/playerui/devtools/Event, com/intuit/playerui/devtools/InternalEvent { public static final field Companion Lcom/intuit/playerui/devtools/BeaconEvent$Companion; - public fun (JJLjava/lang/String;Lkotlinx/serialization/json/JsonElement;Z)V + public fun (JJLjava/lang/String;Lkotlinx/serialization/json/JsonElement;ZLjava/lang/String;)V + public synthetic fun (JJLjava/lang/String;Lkotlinx/serialization/json/JsonElement;ZLjava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V public final fun component1 ()J public final fun component2 ()J public final fun component3 ()Ljava/lang/String; public final fun component4 ()Lkotlinx/serialization/json/JsonElement; public final fun component5 ()Z - public final fun copy (JJLjava/lang/String;Lkotlinx/serialization/json/JsonElement;Z)Lcom/intuit/playerui/devtools/BeaconEvent; - public static synthetic fun copy$default (Lcom/intuit/playerui/devtools/BeaconEvent;JJLjava/lang/String;Lkotlinx/serialization/json/JsonElement;ZILjava/lang/Object;)Lcom/intuit/playerui/devtools/BeaconEvent; + public final fun component6 ()Ljava/lang/String; + public final fun copy (JJLjava/lang/String;Lkotlinx/serialization/json/JsonElement;ZLjava/lang/String;)Lcom/intuit/playerui/devtools/BeaconEvent; + public static synthetic fun copy$default (Lcom/intuit/playerui/devtools/BeaconEvent;JJLjava/lang/String;Lkotlinx/serialization/json/JsonElement;ZLjava/lang/String;ILjava/lang/Object;)Lcom/intuit/playerui/devtools/BeaconEvent; public fun equals (Ljava/lang/Object;)Z public fun getContext ()Lkotlinx/serialization/json/JsonElement; public fun getId ()J public fun getSender ()Ljava/lang/String; public fun getTag ()Z + public fun getTarget ()Ljava/lang/String; public fun getTimestamp ()J public fun getType ()Ljava/lang/String; public fun hashCode ()I @@ -36,15 +39,17 @@ public final class com/intuit/playerui/devtools/BeaconEvent$Companion { public final class com/intuit/playerui/devtools/DevtoolsDataChangeEvent : com/intuit/playerui/devtools/EventWithPayload { public static final field Companion Lcom/intuit/playerui/devtools/DevtoolsDataChangeEvent$Companion; - public fun (Lcom/intuit/playerui/devtools/DevtoolsDataChangeEvent$Payload;JJLjava/lang/String;Lkotlinx/serialization/json/JsonElement;Z)V + public fun (Lcom/intuit/playerui/devtools/DevtoolsDataChangeEvent$Payload;JJLjava/lang/String;Lkotlinx/serialization/json/JsonElement;ZLjava/lang/String;)V + public synthetic fun (Lcom/intuit/playerui/devtools/DevtoolsDataChangeEvent$Payload;JJLjava/lang/String;Lkotlinx/serialization/json/JsonElement;ZLjava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V public final fun component1 ()Lcom/intuit/playerui/devtools/DevtoolsDataChangeEvent$Payload; public final fun component2 ()J public final fun component3 ()J public final fun component4 ()Ljava/lang/String; public final fun component5 ()Lkotlinx/serialization/json/JsonElement; public final fun component6 ()Z - public final fun copy (Lcom/intuit/playerui/devtools/DevtoolsDataChangeEvent$Payload;JJLjava/lang/String;Lkotlinx/serialization/json/JsonElement;Z)Lcom/intuit/playerui/devtools/DevtoolsDataChangeEvent; - public static synthetic fun copy$default (Lcom/intuit/playerui/devtools/DevtoolsDataChangeEvent;Lcom/intuit/playerui/devtools/DevtoolsDataChangeEvent$Payload;JJLjava/lang/String;Lkotlinx/serialization/json/JsonElement;ZILjava/lang/Object;)Lcom/intuit/playerui/devtools/DevtoolsDataChangeEvent; + public final fun component7 ()Ljava/lang/String; + public final fun copy (Lcom/intuit/playerui/devtools/DevtoolsDataChangeEvent$Payload;JJLjava/lang/String;Lkotlinx/serialization/json/JsonElement;ZLjava/lang/String;)Lcom/intuit/playerui/devtools/DevtoolsDataChangeEvent; + public static synthetic fun copy$default (Lcom/intuit/playerui/devtools/DevtoolsDataChangeEvent;Lcom/intuit/playerui/devtools/DevtoolsDataChangeEvent$Payload;JJLjava/lang/String;Lkotlinx/serialization/json/JsonElement;ZLjava/lang/String;ILjava/lang/Object;)Lcom/intuit/playerui/devtools/DevtoolsDataChangeEvent; public fun equals (Ljava/lang/Object;)Z public fun getContext ()Lkotlinx/serialization/json/JsonElement; public fun getId ()J @@ -52,6 +57,7 @@ public final class com/intuit/playerui/devtools/DevtoolsDataChangeEvent : com/in public synthetic fun getPayload ()Ljava/lang/Object; public fun getSender ()Ljava/lang/String; public fun getTag ()Z + public fun getTarget ()Ljava/lang/String; public fun getTimestamp ()J public fun getType ()Ljava/lang/String; public fun hashCode ()I @@ -104,15 +110,17 @@ public final class com/intuit/playerui/devtools/DevtoolsDataChangeEvent$Payload$ public final class com/intuit/playerui/devtools/DevtoolsPluginInteractionEvent : com/intuit/playerui/devtools/EventWithPayload { public static final field Companion Lcom/intuit/playerui/devtools/DevtoolsPluginInteractionEvent$Companion; - public fun (Lcom/intuit/playerui/devtools/DevtoolsPluginInteractionEvent$Payload;JJLjava/lang/String;Lkotlinx/serialization/json/JsonElement;Z)V + public fun (Lcom/intuit/playerui/devtools/DevtoolsPluginInteractionEvent$Payload;JJLjava/lang/String;Lkotlinx/serialization/json/JsonElement;ZLjava/lang/String;)V + public synthetic fun (Lcom/intuit/playerui/devtools/DevtoolsPluginInteractionEvent$Payload;JJLjava/lang/String;Lkotlinx/serialization/json/JsonElement;ZLjava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V public final fun component1 ()Lcom/intuit/playerui/devtools/DevtoolsPluginInteractionEvent$Payload; public final fun component2 ()J public final fun component3 ()J public final fun component4 ()Ljava/lang/String; public final fun component5 ()Lkotlinx/serialization/json/JsonElement; public final fun component6 ()Z - public final fun copy (Lcom/intuit/playerui/devtools/DevtoolsPluginInteractionEvent$Payload;JJLjava/lang/String;Lkotlinx/serialization/json/JsonElement;Z)Lcom/intuit/playerui/devtools/DevtoolsPluginInteractionEvent; - public static synthetic fun copy$default (Lcom/intuit/playerui/devtools/DevtoolsPluginInteractionEvent;Lcom/intuit/playerui/devtools/DevtoolsPluginInteractionEvent$Payload;JJLjava/lang/String;Lkotlinx/serialization/json/JsonElement;ZILjava/lang/Object;)Lcom/intuit/playerui/devtools/DevtoolsPluginInteractionEvent; + public final fun component7 ()Ljava/lang/String; + public final fun copy (Lcom/intuit/playerui/devtools/DevtoolsPluginInteractionEvent$Payload;JJLjava/lang/String;Lkotlinx/serialization/json/JsonElement;ZLjava/lang/String;)Lcom/intuit/playerui/devtools/DevtoolsPluginInteractionEvent; + public static synthetic fun copy$default (Lcom/intuit/playerui/devtools/DevtoolsPluginInteractionEvent;Lcom/intuit/playerui/devtools/DevtoolsPluginInteractionEvent$Payload;JJLjava/lang/String;Lkotlinx/serialization/json/JsonElement;ZLjava/lang/String;ILjava/lang/Object;)Lcom/intuit/playerui/devtools/DevtoolsPluginInteractionEvent; public fun equals (Ljava/lang/Object;)Z public fun getContext ()Lkotlinx/serialization/json/JsonElement; public fun getId ()J @@ -120,6 +128,7 @@ public final class com/intuit/playerui/devtools/DevtoolsPluginInteractionEvent : public synthetic fun getPayload ()Ljava/lang/Object; public fun getSender ()Ljava/lang/String; public fun getTag ()Z + public fun getTarget ()Ljava/lang/String; public fun getTimestamp ()J public fun getType ()Ljava/lang/String; public fun hashCode ()I @@ -172,19 +181,22 @@ public final class com/intuit/playerui/devtools/DevtoolsPluginInteractionEvent$P public final class com/intuit/playerui/devtools/DisconnectEvent : com/intuit/playerui/devtools/Event, com/intuit/playerui/devtools/InternalEvent { public static final field Companion Lcom/intuit/playerui/devtools/DisconnectEvent$Companion; - public fun (JJLjava/lang/String;Lkotlinx/serialization/json/JsonElement;Z)V + public fun (JJLjava/lang/String;Lkotlinx/serialization/json/JsonElement;ZLjava/lang/String;)V + public synthetic fun (JJLjava/lang/String;Lkotlinx/serialization/json/JsonElement;ZLjava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V public final fun component1 ()J public final fun component2 ()J public final fun component3 ()Ljava/lang/String; public final fun component4 ()Lkotlinx/serialization/json/JsonElement; public final fun component5 ()Z - public final fun copy (JJLjava/lang/String;Lkotlinx/serialization/json/JsonElement;Z)Lcom/intuit/playerui/devtools/DisconnectEvent; - public static synthetic fun copy$default (Lcom/intuit/playerui/devtools/DisconnectEvent;JJLjava/lang/String;Lkotlinx/serialization/json/JsonElement;ZILjava/lang/Object;)Lcom/intuit/playerui/devtools/DisconnectEvent; + public final fun component6 ()Ljava/lang/String; + public final fun copy (JJLjava/lang/String;Lkotlinx/serialization/json/JsonElement;ZLjava/lang/String;)Lcom/intuit/playerui/devtools/DisconnectEvent; + public static synthetic fun copy$default (Lcom/intuit/playerui/devtools/DisconnectEvent;JJLjava/lang/String;Lkotlinx/serialization/json/JsonElement;ZLjava/lang/String;ILjava/lang/Object;)Lcom/intuit/playerui/devtools/DisconnectEvent; public fun equals (Ljava/lang/Object;)Z public fun getContext ()Lkotlinx/serialization/json/JsonElement; public fun getId ()J public fun getSender ()Ljava/lang/String; public fun getTag ()Z + public fun getTarget ()Ljava/lang/String; public fun getTimestamp ()J public fun getType ()Ljava/lang/String; public fun hashCode ()I @@ -209,6 +221,7 @@ public final class com/intuit/playerui/devtools/DisconnectEvent$Companion { public abstract class com/intuit/playerui/devtools/Event : com/intuit/playerui/devtools/TransactionMetaData { public static final field Companion Lcom/intuit/playerui/devtools/Event$Companion; public synthetic fun (ILkotlinx/serialization/internal/SerializationConstructorMarker;)V + public fun getTarget ()Ljava/lang/String; public abstract fun getType ()Ljava/lang/String; public static final synthetic fun write$Self (Lcom/intuit/playerui/devtools/Event;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V } @@ -242,15 +255,17 @@ final class com/intuit/playerui/devtools/EventWithPayload$Companion$1 : kotlin/j public final class com/intuit/playerui/devtools/EventsBatchEvent : com/intuit/playerui/devtools/EventWithPayload, com/intuit/playerui/devtools/InternalEvent { public static final field Companion Lcom/intuit/playerui/devtools/EventsBatchEvent$Companion; - public fun (Lcom/intuit/playerui/devtools/EventsBatchEvent$Payload;JJLjava/lang/String;Lkotlinx/serialization/json/JsonElement;Z)V + public fun (Lcom/intuit/playerui/devtools/EventsBatchEvent$Payload;JJLjava/lang/String;Lkotlinx/serialization/json/JsonElement;ZLjava/lang/String;)V + public synthetic fun (Lcom/intuit/playerui/devtools/EventsBatchEvent$Payload;JJLjava/lang/String;Lkotlinx/serialization/json/JsonElement;ZLjava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V public final fun component1 ()Lcom/intuit/playerui/devtools/EventsBatchEvent$Payload; public final fun component2 ()J public final fun component3 ()J public final fun component4 ()Ljava/lang/String; public final fun component5 ()Lkotlinx/serialization/json/JsonElement; public final fun component6 ()Z - public final fun copy (Lcom/intuit/playerui/devtools/EventsBatchEvent$Payload;JJLjava/lang/String;Lkotlinx/serialization/json/JsonElement;Z)Lcom/intuit/playerui/devtools/EventsBatchEvent; - public static synthetic fun copy$default (Lcom/intuit/playerui/devtools/EventsBatchEvent;Lcom/intuit/playerui/devtools/EventsBatchEvent$Payload;JJLjava/lang/String;Lkotlinx/serialization/json/JsonElement;ZILjava/lang/Object;)Lcom/intuit/playerui/devtools/EventsBatchEvent; + public final fun component7 ()Ljava/lang/String; + public final fun copy (Lcom/intuit/playerui/devtools/EventsBatchEvent$Payload;JJLjava/lang/String;Lkotlinx/serialization/json/JsonElement;ZLjava/lang/String;)Lcom/intuit/playerui/devtools/EventsBatchEvent; + public static synthetic fun copy$default (Lcom/intuit/playerui/devtools/EventsBatchEvent;Lcom/intuit/playerui/devtools/EventsBatchEvent$Payload;JJLjava/lang/String;Lkotlinx/serialization/json/JsonElement;ZLjava/lang/String;ILjava/lang/Object;)Lcom/intuit/playerui/devtools/EventsBatchEvent; public fun equals (Ljava/lang/Object;)Z public fun getContext ()Lkotlinx/serialization/json/JsonElement; public fun getId ()J @@ -258,6 +273,7 @@ public final class com/intuit/playerui/devtools/EventsBatchEvent : com/intuit/pl public synthetic fun getPayload ()Ljava/lang/Object; public fun getSender ()Ljava/lang/String; public fun getTag ()Z + public fun getTarget ()Ljava/lang/String; public fun getTimestamp ()J public fun getType ()Ljava/lang/String; public fun hashCode ()I @@ -520,15 +536,17 @@ public final class com/intuit/playerui/devtools/MessengerKt { public final class com/intuit/playerui/devtools/PlayerInitEvent : com/intuit/playerui/devtools/EventWithPayload { public static final field Companion Lcom/intuit/playerui/devtools/PlayerInitEvent$Companion; - public fun (Lcom/intuit/playerui/devtools/PlayerInitEvent$Payload;JJLjava/lang/String;Lkotlinx/serialization/json/JsonElement;Z)V + public fun (Lcom/intuit/playerui/devtools/PlayerInitEvent$Payload;JJLjava/lang/String;Lkotlinx/serialization/json/JsonElement;ZLjava/lang/String;)V + public synthetic fun (Lcom/intuit/playerui/devtools/PlayerInitEvent$Payload;JJLjava/lang/String;Lkotlinx/serialization/json/JsonElement;ZLjava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V public final fun component1 ()Lcom/intuit/playerui/devtools/PlayerInitEvent$Payload; public final fun component2 ()J public final fun component3 ()J public final fun component4 ()Ljava/lang/String; public final fun component5 ()Lkotlinx/serialization/json/JsonElement; public final fun component6 ()Z - public final fun copy (Lcom/intuit/playerui/devtools/PlayerInitEvent$Payload;JJLjava/lang/String;Lkotlinx/serialization/json/JsonElement;Z)Lcom/intuit/playerui/devtools/PlayerInitEvent; - public static synthetic fun copy$default (Lcom/intuit/playerui/devtools/PlayerInitEvent;Lcom/intuit/playerui/devtools/PlayerInitEvent$Payload;JJLjava/lang/String;Lkotlinx/serialization/json/JsonElement;ZILjava/lang/Object;)Lcom/intuit/playerui/devtools/PlayerInitEvent; + public final fun component7 ()Ljava/lang/String; + public final fun copy (Lcom/intuit/playerui/devtools/PlayerInitEvent$Payload;JJLjava/lang/String;Lkotlinx/serialization/json/JsonElement;ZLjava/lang/String;)Lcom/intuit/playerui/devtools/PlayerInitEvent; + public static synthetic fun copy$default (Lcom/intuit/playerui/devtools/PlayerInitEvent;Lcom/intuit/playerui/devtools/PlayerInitEvent$Payload;JJLjava/lang/String;Lkotlinx/serialization/json/JsonElement;ZLjava/lang/String;ILjava/lang/Object;)Lcom/intuit/playerui/devtools/PlayerInitEvent; public fun equals (Ljava/lang/Object;)Z public fun getContext ()Lkotlinx/serialization/json/JsonElement; public fun getId ()J @@ -536,6 +554,7 @@ public final class com/intuit/playerui/devtools/PlayerInitEvent : com/intuit/pla public synthetic fun getPayload ()Ljava/lang/Object; public fun getSender ()Ljava/lang/String; public fun getTag ()Z + public fun getTarget ()Ljava/lang/String; public fun getTimestamp ()J public fun getType ()Ljava/lang/String; public fun hashCode ()I @@ -592,15 +611,17 @@ final class com/intuit/playerui/devtools/PlayerInitEvent$Payload$Companion$$chil public final class com/intuit/playerui/devtools/RequestLostEventsEvent : com/intuit/playerui/devtools/EventWithPayload, com/intuit/playerui/devtools/InternalEvent { public static final field Companion Lcom/intuit/playerui/devtools/RequestLostEventsEvent$Companion; - public fun (Lcom/intuit/playerui/devtools/RequestLostEventsEvent$Payload;JJLjava/lang/String;Lkotlinx/serialization/json/JsonElement;Z)V + public fun (Lcom/intuit/playerui/devtools/RequestLostEventsEvent$Payload;JJLjava/lang/String;Lkotlinx/serialization/json/JsonElement;ZLjava/lang/String;)V + public synthetic fun (Lcom/intuit/playerui/devtools/RequestLostEventsEvent$Payload;JJLjava/lang/String;Lkotlinx/serialization/json/JsonElement;ZLjava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V public final fun component1 ()Lcom/intuit/playerui/devtools/RequestLostEventsEvent$Payload; public final fun component2 ()J public final fun component3 ()J public final fun component4 ()Ljava/lang/String; public final fun component5 ()Lkotlinx/serialization/json/JsonElement; public final fun component6 ()Z - public final fun copy (Lcom/intuit/playerui/devtools/RequestLostEventsEvent$Payload;JJLjava/lang/String;Lkotlinx/serialization/json/JsonElement;Z)Lcom/intuit/playerui/devtools/RequestLostEventsEvent; - public static synthetic fun copy$default (Lcom/intuit/playerui/devtools/RequestLostEventsEvent;Lcom/intuit/playerui/devtools/RequestLostEventsEvent$Payload;JJLjava/lang/String;Lkotlinx/serialization/json/JsonElement;ZILjava/lang/Object;)Lcom/intuit/playerui/devtools/RequestLostEventsEvent; + public final fun component7 ()Ljava/lang/String; + public final fun copy (Lcom/intuit/playerui/devtools/RequestLostEventsEvent$Payload;JJLjava/lang/String;Lkotlinx/serialization/json/JsonElement;ZLjava/lang/String;)Lcom/intuit/playerui/devtools/RequestLostEventsEvent; + public static synthetic fun copy$default (Lcom/intuit/playerui/devtools/RequestLostEventsEvent;Lcom/intuit/playerui/devtools/RequestLostEventsEvent$Payload;JJLjava/lang/String;Lkotlinx/serialization/json/JsonElement;ZLjava/lang/String;ILjava/lang/Object;)Lcom/intuit/playerui/devtools/RequestLostEventsEvent; public fun equals (Ljava/lang/Object;)Z public fun getContext ()Lkotlinx/serialization/json/JsonElement; public fun getId ()J @@ -608,6 +629,7 @@ public final class com/intuit/playerui/devtools/RequestLostEventsEvent : com/int public synthetic fun getPayload ()Ljava/lang/Object; public fun getSender ()Ljava/lang/String; public fun getTag ()Z + public fun getTarget ()Ljava/lang/String; public fun getTimestamp ()J public fun getType ()Ljava/lang/String; public fun hashCode ()I @@ -661,6 +683,7 @@ public abstract interface class com/intuit/playerui/devtools/TransactionMetaData public abstract fun getId ()J public abstract fun getSender ()Ljava/lang/String; public abstract fun getTag ()Z + public abstract fun getTarget ()Ljava/lang/String; public abstract fun getTimestamp ()J } @@ -683,6 +706,7 @@ final class com/intuit/playerui/devtools/TransactionMetaData$Context$Companion$1 } public final class com/intuit/playerui/devtools/TransactionMetaData$DefaultImpls { + public static fun getTarget (Lcom/intuit/playerui/devtools/TransactionMetaData;)Ljava/lang/String; } public final class com/intuit/playerui/devtools/UnknownEvent : com/intuit/playerui/devtools/Event, com/intuit/playerui/core/bridge/NodeWrapper { @@ -697,6 +721,7 @@ public final class com/intuit/playerui/devtools/UnknownEvent : com/intuit/player public fun getNode ()Lcom/intuit/playerui/core/bridge/Node; public fun getSender ()Ljava/lang/String; public fun getTag ()Z + public fun getTarget ()Ljava/lang/String; public fun getTimestamp ()J public fun getType ()Ljava/lang/String; public fun hashCode ()I diff --git a/devtools/messenger/jvm/src/main/kotlin/com/intuit/playerui/devtools/Event.kt b/devtools/messenger/jvm/src/main/kotlin/com/intuit/playerui/devtools/Event.kt index c84c702..43732ea 100644 --- a/devtools/messenger/jvm/src/main/kotlin/com/intuit/playerui/devtools/Event.kt +++ b/devtools/messenger/jvm/src/main/kotlin/com/intuit/playerui/devtools/Event.kt @@ -20,6 +20,9 @@ public interface TransactionMetaData { @SerialName("_messenger_") public val tag: Boolean + /** ID of the messenger this event is addressed to, or null if it is broadcast */ + public val target: String? get() = null + @Serializable public enum class Context { @SerialName("player") @@ -50,6 +53,7 @@ public data class BeaconEvent( override val context: JsonElement, @SerialName("_messenger_") override val tag: Boolean, + override val target: String? = null, ) : Event(), InternalEvent { public override val type: String = "MESSENGER_BEACON" @@ -65,6 +69,7 @@ public data class EventsBatchEvent( override val context: JsonElement, @SerialName("_messenger_") override val tag: Boolean, + override val target: String? = null, ) : EventWithPayload(), InternalEvent { public override val type: String = "MESSENGER_EVENT_BATCH" @@ -85,6 +90,7 @@ public data class RequestLostEventsEvent( override val context: JsonElement, @SerialName("_messenger_") override val tag: Boolean, + override val target: String? = null, ) : EventWithPayload(), InternalEvent { public override val type: String = "MESSENGER_REQUEST_LOST_EVENTS" @@ -104,6 +110,7 @@ public data class DisconnectEvent( override val context: JsonElement, @SerialName("_messenger_") override val tag: Boolean, + override val target: String? = null, ) : Event(), InternalEvent { public override val type: String = "MESSENGER_DISCONNECT" @@ -119,6 +126,7 @@ public data class DevtoolsPluginInteractionEvent( override val context: JsonElement, @SerialName("_messenger_") override val tag: Boolean, + override val target: String? = null, ) : EventWithPayload() { public override val type: String = "PLAYER_DEVTOOLS_PLUGIN_INTERACTION" @@ -138,6 +146,7 @@ public data class PlayerInitEvent( override val context: JsonElement, @SerialName("_messenger_") override val tag: Boolean, + override val target: String? = null, ) : EventWithPayload() { public override val type: String = "PLAYER_DEVTOOLS_PLAYER_INIT" @@ -156,6 +165,7 @@ public data class DevtoolsDataChangeEvent( override val context: JsonElement, @SerialName("_messenger_") override val tag: Boolean, + override val target: String? = null, ) : EventWithPayload() { public override val type: String = "PLAYER_DEVTOOLS_PLUGIN_DATA_CHANGE" @@ -177,6 +187,7 @@ public data class UnknownEvent( @SerialName("_messenger_") override val tag: Boolean by NodeSerializableField() + override val target: String? by NodeSerializableField() override val type: String by NodeSerializableField() internal object Serializer : KSerializer by NodeWrapperSerializer(::UnknownEvent) diff --git a/devtools/messenger/jvm/src/main/kotlin/com/intuit/playerui/devtools/Messenger.kt b/devtools/messenger/jvm/src/main/kotlin/com/intuit/playerui/devtools/Messenger.kt index c799ee0..772b280 100644 --- a/devtools/messenger/jvm/src/main/kotlin/com/intuit/playerui/devtools/Messenger.kt +++ b/devtools/messenger/jvm/src/main/kotlin/com/intuit/playerui/devtools/Messenger.kt @@ -99,7 +99,7 @@ public class Messenger( @Serializable public data class Options( - public val context: TransactionMetaData.Context, + @SerialName("_context") public val context: TransactionMetaData.Context, // Not transient because we want to require an implementation, but it does mean deserialization not supported @SerialName("_sendMessage") public val sendMessage: suspend (message: Event) -> Unit, public val addListener: (callback: MessageHandler) -> Unit, @@ -111,6 +111,15 @@ public class Messenger( public val debug: Boolean? = null, @Transient public val logger: Logger = Logger { }, ) { + // Runtime formats encode enums by ordinal, but the JS Messenger expects the context's serial name + @SerialName("context") + @Suppress("ktlint:standard:backing-property-naming") + private val _context: String = + TransactionMetaData.Context + .serializer() + .descriptor + .getElementName(context.ordinal) + // [Logger] structure can't automatically serialize, so we represent as it should be manually @SerialName("logger") @Suppress("ktlint:standard:backing-property-naming") diff --git a/devtools/messenger/jvm/src/test/kotlin/com/intuit/playerui/devtools/MessengerTest.kt b/devtools/messenger/jvm/src/test/kotlin/com/intuit/playerui/devtools/MessengerTest.kt index 9d27dfc..451ddb8 100644 --- a/devtools/messenger/jvm/src/test/kotlin/com/intuit/playerui/devtools/MessengerTest.kt +++ b/devtools/messenger/jvm/src/test/kotlin/com/intuit/playerui/devtools/MessengerTest.kt @@ -115,6 +115,7 @@ class MessengerTest : Messenger.Logger { assertInstanceOf(beacon) assertEquals("queue", beacon.sender) + assertEquals(JsonPrimitive("devtools"), beacon.context) } @Test fun `queue messages while handshake is in progress, and send them as the connection is established`() = @@ -153,6 +154,7 @@ class MessengerTest : Messenger.Logger { } assertInstanceOf(batch) + assertEquals("test-2", batch.target) assertEquals(3, batch.payload.events.size) batch.payload.events.forEachIndexed { index, event -> assertInstanceOf(event) @@ -160,6 +162,24 @@ class MessengerTest : Messenger.Logger { } } + @Test fun `typed events keep their target`() { + buildMessenger("target") + listeners.first().invoke( + DevtoolsPluginInteractionEvent( + payload = DevtoolsPluginInteractionEvent.Payload("evaluate-expression", "{{foo}}"), + id = -1, + timestamp = 0, + sender = "test-2", + context = JsonPrimitive("player"), + tag = true, + target = "target", + ), + ) + + val event = assertInstanceOf(handled.single()) + assertEquals("target", event.target) + } + @Test fun `failure sending message triggers failure handler`() = runBlocking { val failed = diff --git a/devtools/plugin/jvm/src/main/kotlin/com/intuit/playerui/devtools/DevtoolsPlugin.kt b/devtools/plugin/jvm/src/main/kotlin/com/intuit/playerui/devtools/DevtoolsPlugin.kt index 884dc11..2022db2 100644 --- a/devtools/plugin/jvm/src/main/kotlin/com/intuit/playerui/devtools/DevtoolsPlugin.kt +++ b/devtools/plugin/jvm/src/main/kotlin/com/intuit/playerui/devtools/DevtoolsPlugin.kt @@ -143,7 +143,8 @@ public open class DevtoolsPlugin( ?: throw PlayerException("Could not find registerMessenger on DevtoolsPlugin instance") } - public fun registerMessenger(messenger: Messenger): () -> Unit = registerMessenger.invoke(messenger) + // [Messenger] is also a [MessageHandler], so passing it directly would encode it as a JS function -- pass the backing JS instance instead + public fun registerMessenger(messenger: Messenger): () -> Unit = registerMessenger.invoke(messenger.node) private val apply by lazy { node.getInvokable("apply") diff --git a/devtools/plugin/jvm/src/test/kotlin/com/intuit/playerui/devtools/DevtoolsPluginTest.kt b/devtools/plugin/jvm/src/test/kotlin/com/intuit/playerui/devtools/DevtoolsPluginTest.kt index 4af34d7..d0a7dbe 100644 --- a/devtools/plugin/jvm/src/test/kotlin/com/intuit/playerui/devtools/DevtoolsPluginTest.kt +++ b/devtools/plugin/jvm/src/test/kotlin/com/intuit/playerui/devtools/DevtoolsPluginTest.kt @@ -1,9 +1,16 @@ package com.intuit.playerui.devtools +import com.intuit.playerui.core.bridge.serialization.format.registerSerializersModule import com.intuit.playerui.devtools.DevtoolsPlugin.Module.DevtoolsPlugin import com.intuit.playerui.utils.test.RuntimeTest +import kotlinx.coroutines.CompletableDeferred +import kotlinx.coroutines.runBlocking +import kotlinx.coroutines.withTimeout +import kotlinx.serialization.json.JsonPrimitive +import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Assertions.assertTrue import org.junit.jupiter.api.Test +import org.junit.jupiter.api.assertInstanceOf class DevtoolsPluginTest : RuntimeTest(), @@ -26,4 +33,46 @@ class DevtoolsPluginTest : assertTrue(plugin.checkIfDevtoolsIsActive()) } + + @Test fun `registered messenger sends store messages`() { + runtime.format.registerSerializersModule { + polymorphicDefault(Event::class) { UnknownEvent.serializer() } + } + val sent = CompletableDeferred() + val plugin = + runtime.DevtoolsPlugin( + DevtoolsPlugin.Options( + "test", + emptyMap(), + this, + ), + ) + val messenger = + Messenger( + Messenger.Options( + context = TransactionMetaData.Context.PLAYER, + id = "test", + sendMessage = { sent.complete(it) }, + addListener = {}, + removeListener = {}, + messageCallback = plugin.store::dispatch, + ), + ).apply { apply(runtime) } + + plugin.registerMessenger(messenger) + plugin.store.dispatch( + PlayerInitEvent( + payload = PlayerInitEvent.Payload(emptyMap()), + id = -1, + timestamp = 0, + sender = "test", + context = JsonPrimitive("player"), + tag = true, + ), + ) + + val init = assertInstanceOf(runBlocking { withTimeout(5000) { sent.await() } }) + assertEquals("test", init.sender) + assertEquals(JsonPrimitive("player"), init.context) + } } From da445daf7f422932a910a627979fec10f7b09c45 Mon Sep 17 00:00:00 2001 From: Ketan Reddy Date: Thu, 15 Oct 2026 13:37:22 -0700 Subject: [PATCH 2/2] PR feedback --- .../com/intuit/playerui/devtools/Messenger.kt | 7 ++++ .../playerui/devtools/DevtoolsPlugin.kt | 13 +++++-- .../playerui/devtools/DevtoolsPluginTest.kt | 35 +++++++++++++++++++ 3 files changed, 53 insertions(+), 2 deletions(-) diff --git a/devtools/messenger/jvm/src/main/kotlin/com/intuit/playerui/devtools/Messenger.kt b/devtools/messenger/jvm/src/main/kotlin/com/intuit/playerui/devtools/Messenger.kt index 772b280..910ffcf 100644 --- a/devtools/messenger/jvm/src/main/kotlin/com/intuit/playerui/devtools/Messenger.kt +++ b/devtools/messenger/jvm/src/main/kotlin/com/intuit/playerui/devtools/Messenger.kt @@ -21,6 +21,13 @@ import kotlinx.serialization.json.JsonElement public typealias MessageHandler = (Event) -> Unit +/** + * JVM wrapper around the JS Messenger. + * + * Note: because this is also a [MessageHandler], runtime formats encode a [Messenger] as a JS + * function rather than through [Messenger.Serializer]. When handing a messenger to JS, pass + * [node] (the backing JS instance) instead of the [Messenger] itself. + */ @Serializable(with = Messenger.Serializer::class) public class Messenger( internal val options: Options, diff --git a/devtools/plugin/jvm/src/main/kotlin/com/intuit/playerui/devtools/DevtoolsPlugin.kt b/devtools/plugin/jvm/src/main/kotlin/com/intuit/playerui/devtools/DevtoolsPlugin.kt index 2022db2..120a2de 100644 --- a/devtools/plugin/jvm/src/main/kotlin/com/intuit/playerui/devtools/DevtoolsPlugin.kt +++ b/devtools/plugin/jvm/src/main/kotlin/com/intuit/playerui/devtools/DevtoolsPlugin.kt @@ -143,8 +143,17 @@ public open class DevtoolsPlugin( ?: throw PlayerException("Could not find registerMessenger on DevtoolsPlugin instance") } - // [Messenger] is also a [MessageHandler], so passing it directly would encode it as a JS function -- pass the backing JS instance instead - public fun registerMessenger(messenger: Messenger): () -> Unit = registerMessenger.invoke(messenger.node) + /** Register a [Messenger] that has already been applied to this plugin's runtime */ + public fun registerMessenger(messenger: Messenger): () -> Unit { + if (!messenger.isInstantiated) { + throw PlayerException("Messenger must be applied to the DevtoolsPlugin runtime before it is registered") + } + if (messenger.node.runtime !== node.runtime) { + throw PlayerException("Messenger was applied to a different runtime than the DevtoolsPlugin") + } + // pass the backing JS instance -- see [Messenger] for why the Messenger itself can't be passed + return registerMessenger.invoke(messenger.node) + } private val apply by lazy { node.getInvokable("apply") diff --git a/devtools/plugin/jvm/src/test/kotlin/com/intuit/playerui/devtools/DevtoolsPluginTest.kt b/devtools/plugin/jvm/src/test/kotlin/com/intuit/playerui/devtools/DevtoolsPluginTest.kt index d0a7dbe..ef30639 100644 --- a/devtools/plugin/jvm/src/test/kotlin/com/intuit/playerui/devtools/DevtoolsPluginTest.kt +++ b/devtools/plugin/jvm/src/test/kotlin/com/intuit/playerui/devtools/DevtoolsPluginTest.kt @@ -1,6 +1,8 @@ package com.intuit.playerui.devtools +import com.intuit.playerui.core.bridge.runtime.runtimeFactory import com.intuit.playerui.core.bridge.serialization.format.registerSerializersModule +import com.intuit.playerui.core.player.PlayerException import com.intuit.playerui.devtools.DevtoolsPlugin.Module.DevtoolsPlugin import com.intuit.playerui.utils.test.RuntimeTest import kotlinx.coroutines.CompletableDeferred @@ -11,6 +13,7 @@ import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Assertions.assertTrue import org.junit.jupiter.api.Test import org.junit.jupiter.api.assertInstanceOf +import org.junit.jupiter.api.assertThrows class DevtoolsPluginTest : RuntimeTest(), @@ -75,4 +78,36 @@ class DevtoolsPluginTest : assertEquals("test", init.sender) assertEquals(JsonPrimitive("player"), init.context) } + + private fun buildMessenger() = + Messenger( + Messenger.Options( + context = TransactionMetaData.Context.PLAYER, + id = "test", + sendMessage = {}, + addListener = {}, + removeListener = {}, + messageCallback = {}, + ), + ) + + @Test fun `registering a messenger before it is applied throws`() { + val plugin = runtime.DevtoolsPlugin(DevtoolsPlugin.Options("test", emptyMap(), this)) + + val exception = assertThrows { plugin.registerMessenger(buildMessenger()) } + assertTrue(exception.message!!.contains("must be applied")) + } + + @Test fun `registering a messenger applied to another runtime throws`() { + val plugin = runtime.DevtoolsPlugin(DevtoolsPlugin.Options("test", emptyMap(), this)) + val otherRuntime = runtimeFactory.create() + try { + val messenger = buildMessenger().apply { apply(otherRuntime) } + + val exception = assertThrows { plugin.registerMessenger(messenger) } + assertTrue(exception.message!!.contains("different runtime")) + } finally { + otherRuntime.release() + } + } }