refactor

Author: BFergerson

src/commonMain/kotlin/spp.protocol/instrument/command/LiveInstrumentCommand.kt

@@ -18,9 +18,12 @@
 package spp.protocol.instrument.command
 
 import kotlinx.serialization.Serializable
+import spp.protocol.instrument.LiveInstrument
+import spp.protocol.instrument.LiveSourceLocation
 
 @Serializable
 data class LiveInstrumentCommand(
     var commandType: CommandType,
-    var context: LiveInstrumentContext
+    var instruments: Set<LiveInstrument> = emptySet(),
+    var locations: Set<LiveSourceLocation> = emptySet()
 )

src/commonMain/kotlin/spp.protocol/instrument/command/LiveInstrumentContext.kt

@@ -37,7 +37,6 @@ import spp.protocol.artifact.trace.TraceResult
 import spp.protocol.instrument.*
 import spp.protocol.instrument.command.CommandType
 import spp.protocol.instrument.command.LiveInstrumentCommand
-import spp.protocol.instrument.command.LiveInstrumentContext
 import spp.protocol.instrument.event.LiveBreakpointHit
 import spp.protocol.instrument.event.LiveInstrumentRemoved
 import spp.protocol.platform.developer.SelfInfo
@@ -235,22 +234,20 @@ object ProtocolMarshaller {
     fun deserializeLiveInstrumentCommand(value: JsonObject): LiveInstrumentCommand {
         return LiveInstrumentCommand(
             CommandType.valueOf(value.getString("commandType")),
-            LiveInstrumentContext(
-                value.getJsonObject("context").getJsonArray("instruments").list.map {
-                    if (it is JsonObject) {
-                        deserializeLiveInstrument(it)
-                    } else {
-                        deserializeLiveInstrument(JsonObject.mapFrom(it))
-                    }
-                }.toSet(),
-                value.getJsonObject("context").getJsonArray("locations").list.map {
-                    if (it is JsonObject) {
-                        deserializeLiveSourceLocation(it)
-                    } else {
-                        deserializeLiveSourceLocation(JsonObject.mapFrom(it))
-                    }
-                }.toSet()
-            )
+            value.getJsonArray("instruments").list.map {
+                if (it is JsonObject) {
+                    deserializeLiveInstrument(it)
+                } else {
+                    deserializeLiveInstrument(JsonObject.mapFrom(it))
+                }
+            }.toSet(),
+            value.getJsonArray("locations").list.map {
+                if (it is JsonObject) {
+                    deserializeLiveSourceLocation(it)
+                } else {
+                    deserializeLiveSourceLocation(JsonObject.mapFrom(it))
+                }
+            }.toSet()
         )
     }
 

src/jvmMain/kotlin/spp/protocol/ProtocolMarshaller.kt

@@ -48,53 +48,46 @@ class TCPServiceFrameParser(val vertx: Vertx, val socket: NetSocket) : Handler<A
         val frame = event.result()
         log.trace("Received frame: {}", frame)
 
-        //todo: revisit this || after fixing below todo
-        if ("message" == frame.getString("type") || "send" == frame.getString("type")) {
-            if (frame.getString("replyAddress") != null) {
-                val deliveryOptions = DeliveryOptions()
-                frame.getJsonObject("headers").fieldNames().forEach {
-                    deliveryOptions.addHeader(it, frame.getJsonObject("headers").getString(it))
-                }
-                vertx.eventBus().request<Any>(
-                    frame.getString("address"), frame.getJsonObject("body"), deliveryOptions
-                ).onComplete {
-                    if (it.succeeded()) {
-                        FrameHelper.sendFrame(
-                            BridgeEventType.SEND.name.lowercase(),
-                            frame.getString("replyAddress"),
-                            it.result().body(),
-                            socket
-                        )
-                    } else {
-                        val replyException = it.cause() as ReplyException
-                        FrameHelper.writeFrame(
-                            JsonObject()
-                                .put("type", BridgeEventType.SEND.name.lowercase())
-                                .put("address", frame.getString("replyAddress"))
-                                .put("failureCode", replyException.failureCode())
-                                .put("failureType", replyException.failureType().name)
-                                .put("message", replyException.message),
-                            socket
-                        )
-                    }
-                }
-            } else {
-                val body = frame.getValue("body")
-                if (body is JsonObject) {
-                    if (body.getString("message")?.startsWith("EventBusException:") == true) {
-                        handleErrorFrame(body.put("address", frame.getString("address")))
-                    } else {
-                        vertx.eventBus().send(frame.getString("address"), body)
-                    }
+        if (frame.getString("replyAddress") != null) {
+            val deliveryOptions = DeliveryOptions()
+            frame.getJsonObject("headers").fieldNames().forEach {
+                deliveryOptions.addHeader(it, frame.getJsonObject("headers").getString(it))
+            }
+            vertx.eventBus().request<Any>(
+                frame.getString("address"), frame.getJsonObject("body"), deliveryOptions
+            ).onComplete {
+                if (it.succeeded()) {
+                    FrameHelper.sendFrame(
+                        BridgeEventType.SEND.name.lowercase(),
+                        frame.getString("replyAddress"),
+                        it.result().body(),
+                        socket
+                    )
                 } else {
-                    vertx.eventBus().send(frame.getString("address"), body)
+                    val replyException = it.cause() as ReplyException
+                    FrameHelper.writeFrame(
+                        JsonObject()
+                            .put("type", BridgeEventType.SEND.name.lowercase())
+                            .put("address", frame.getString("replyAddress"))
+                            .put("failureCode", replyException.failureCode())
+                            .put("failureType", replyException.failureType().name)
+                            .put("message", replyException.message),
+                        socket
+                    )
                 }
             }
-        } else if ("err" == frame.getString("type")) {
+        } else if (frame.getString("address") != null) {
+            val body = frame.getValue("body")
+            if (body == null && frame.getString("message")?.startsWith("EventBusException:") == true) {
+                handleErrorFrame(frame)
+            } else if (body is JsonObject && body.getString("message")?.startsWith("EventBusException:") == true) {
+                handleErrorFrame(body.put("address", frame.getString("address")))
+            } else {
+                vertx.eventBus().send(frame.getString("address"), body)
+            }
+        } else {
             //directly thrown event bus exceptions
             throw ReplyException(ReplyFailure.ERROR, frame.getString("message"))
-        } else {
-            throw UnsupportedOperationException(frame.toString())
         }
     }