Merge pull request #83 from MrMineO5/issue-609

Remove LiveService in favor of LiveManagementService

Author: BFergerson

src/commonMain/kotlin/spp.protocol/platform/auth/CommandType.kt

@@ -17,7 +17,7 @@
 package spp.protocol.platform.auth
 
 enum class CommandType {
-    LIVE_SERVICE,
+    LIVE_MANAGEMENT_SERVICE,
     LIVE_VIEW,
     LIVE_INSTRUMENT
 }

src/commonMain/kotlin/spp.protocol/platform/auth/RolePermission.kt

@@ -19,40 +19,40 @@ package spp.protocol.platform.auth
 import spp.protocol.platform.auth.CommandType.*
 
 enum class RolePermission(val manager: Boolean, val commandType: CommandType) {
-    RESET(true, LIVE_SERVICE),
+    RESET(true, LIVE_MANAGEMENT_SERVICE),
 
     //clients
-    ADD_CLIENT_ACCESS(true, LIVE_SERVICE),
-    REMOVE_CLIENT_ACCESS(true, LIVE_SERVICE),
-    GET_CLIENT_ACCESSORS(true, LIVE_SERVICE),
-    UPDATE_CLIENT_ACCESS(true, LIVE_SERVICE),
+    ADD_CLIENT_ACCESS(true, LIVE_MANAGEMENT_SERVICE),
+    REMOVE_CLIENT_ACCESS(true, LIVE_MANAGEMENT_SERVICE),
+    GET_CLIENT_ACCESSORS(true, LIVE_MANAGEMENT_SERVICE),
+    UPDATE_CLIENT_ACCESS(true, LIVE_MANAGEMENT_SERVICE),
 
     //devs
-    ADD_DEVELOPER(true, LIVE_SERVICE),
-    REMOVE_DEVELOPER(true, LIVE_SERVICE),
-    GET_DEVELOPERS(true, LIVE_SERVICE),
-    REFRESH_DEVELOPER_TOKEN(true, LIVE_SERVICE),
+    ADD_DEVELOPER(true, LIVE_MANAGEMENT_SERVICE),
+    REMOVE_DEVELOPER(true, LIVE_MANAGEMENT_SERVICE),
+    GET_DEVELOPERS(true, LIVE_MANAGEMENT_SERVICE),
+    REFRESH_DEVELOPER_TOKEN(true, LIVE_MANAGEMENT_SERVICE),
 
     //roles
-    ADD_ROLE(true, LIVE_SERVICE),
-    REMOVE_ROLE(true, LIVE_SERVICE),
-    GET_ROLES(true, LIVE_SERVICE),
-    GET_DEVELOPER_ROLES(true, LIVE_SERVICE),
-    ADD_DEVELOPER_ROLE(true, LIVE_SERVICE),
-    REMOVE_DEVELOPER_ROLE(true, LIVE_SERVICE),
+    ADD_ROLE(true, LIVE_MANAGEMENT_SERVICE),
+    REMOVE_ROLE(true, LIVE_MANAGEMENT_SERVICE),
+    GET_ROLES(true, LIVE_MANAGEMENT_SERVICE),
+    GET_DEVELOPER_ROLES(true, LIVE_MANAGEMENT_SERVICE),
+    ADD_DEVELOPER_ROLE(true, LIVE_MANAGEMENT_SERVICE),
+    REMOVE_DEVELOPER_ROLE(true, LIVE_MANAGEMENT_SERVICE),
 
     //permissions
-    GET_DEVELOPER_PERMISSIONS(true, LIVE_SERVICE),
-    GET_ROLE_PERMISSIONS(true, LIVE_SERVICE),
-    ADD_ROLE_PERMISSION(true, LIVE_SERVICE),
-    REMOVE_ROLE_PERMISSION(true, LIVE_SERVICE),
+    GET_DEVELOPER_PERMISSIONS(true, LIVE_MANAGEMENT_SERVICE),
+    GET_ROLE_PERMISSIONS(true, LIVE_MANAGEMENT_SERVICE),
+    ADD_ROLE_PERMISSION(true, LIVE_MANAGEMENT_SERVICE),
+    REMOVE_ROLE_PERMISSION(true, LIVE_MANAGEMENT_SERVICE),
 
     //instrument access
-    GET_ACCESS_PERMISSIONS(true, LIVE_SERVICE),
-    GET_DATA_REDACTIONS(true, LIVE_SERVICE),
-    UPDATE_DATA_REDACTION(true, LIVE_SERVICE),
-    ADD_ACCESS_PERMISSION(true, LIVE_SERVICE),
-    REMOVE_ACCESS_PERMISSION(true, LIVE_SERVICE),
+    GET_ACCESS_PERMISSIONS(true, LIVE_MANAGEMENT_SERVICE),
+    GET_DATA_REDACTIONS(true, LIVE_MANAGEMENT_SERVICE),
+    UPDATE_DATA_REDACTION(true, LIVE_MANAGEMENT_SERVICE),
+    ADD_ACCESS_PERMISSION(true, LIVE_MANAGEMENT_SERVICE),
+    REMOVE_ACCESS_PERMISSION(true, LIVE_MANAGEMENT_SERVICE),
 
     //instruments
     ADD_LIVE_BREAKPOINT(false, LIVE_INSTRUMENT),

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

@@ -29,7 +29,6 @@ object SourceServices {
 
     object Utilize {
         const val LIVE_MANAGEMENT_SERVICE = "spp.service.live-management-service"
-        const val LIVE_SERVICE = "spp.service.live-service"
         const val LIVE_INSTRUMENT = "spp.service.live-instrument"
         const val LIVE_VIEW = "spp.service.live-view"
     }

src/jvmMain/kotlin/spp/protocol/service/LiveManagementService.kt

@@ -22,9 +22,13 @@ import io.vertx.codegen.annotations.VertxGen
 import io.vertx.core.Future
 import io.vertx.core.Vertx
 import io.vertx.core.eventbus.DeliveryOptions
+import io.vertx.core.json.JsonObject
 import spp.protocol.SourceServices.Utilize.LIVE_MANAGEMENT_SERVICE
 import spp.protocol.platform.auth.ClientAccess
 import spp.protocol.platform.auth.RolePermission
+import spp.protocol.platform.developer.SelfInfo
+import spp.protocol.platform.general.Service
+import spp.protocol.platform.status.ActiveInstance
 
 
 /**
@@ -53,4 +57,10 @@ interface LiveManagementService {
     fun addClientAccess(): Future<ClientAccess>
     fun removeClientAccess(id: String): Future<Boolean>
     fun updateClientAccess(id: String): Future<ClientAccess>
+
+    fun getClients(): Future<JsonObject>
+    fun getStats(): Future<JsonObject>
+    fun getSelf(): Future<SelfInfo>
+    fun getServices(): Future<List<Service>>
+    fun getActiveProbes(): Future<List<ActiveInstance>>
 }