Skip to content

Commit 511541f

Browse files
authored
Merge pull request #83 from MrMineO5/issue-609
Remove LiveService in favor of LiveManagementService
2 parents 57f7a57 + 536f01f commit 511541f

File tree

5 files changed

+35
-82
lines changed

5 files changed

+35
-82
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
package spp.protocol.platform.auth
1818

1919
enum class CommandType {
20-
LIVE_SERVICE,
20+
LIVE_MANAGEMENT_SERVICE,
2121
LIVE_VIEW,
2222
LIVE_INSTRUMENT
2323
}

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

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -19,40 +19,40 @@ package spp.protocol.platform.auth
1919
import spp.protocol.platform.auth.CommandType.*
2020

2121
enum class RolePermission(val manager: Boolean, val commandType: CommandType) {
22-
RESET(true, LIVE_SERVICE),
22+
RESET(true, LIVE_MANAGEMENT_SERVICE),
2323

2424
//clients
25-
ADD_CLIENT_ACCESS(true, LIVE_SERVICE),
26-
REMOVE_CLIENT_ACCESS(true, LIVE_SERVICE),
27-
GET_CLIENT_ACCESSORS(true, LIVE_SERVICE),
28-
UPDATE_CLIENT_ACCESS(true, LIVE_SERVICE),
25+
ADD_CLIENT_ACCESS(true, LIVE_MANAGEMENT_SERVICE),
26+
REMOVE_CLIENT_ACCESS(true, LIVE_MANAGEMENT_SERVICE),
27+
GET_CLIENT_ACCESSORS(true, LIVE_MANAGEMENT_SERVICE),
28+
UPDATE_CLIENT_ACCESS(true, LIVE_MANAGEMENT_SERVICE),
2929

3030
//devs
31-
ADD_DEVELOPER(true, LIVE_SERVICE),
32-
REMOVE_DEVELOPER(true, LIVE_SERVICE),
33-
GET_DEVELOPERS(true, LIVE_SERVICE),
34-
REFRESH_DEVELOPER_TOKEN(true, LIVE_SERVICE),
31+
ADD_DEVELOPER(true, LIVE_MANAGEMENT_SERVICE),
32+
REMOVE_DEVELOPER(true, LIVE_MANAGEMENT_SERVICE),
33+
GET_DEVELOPERS(true, LIVE_MANAGEMENT_SERVICE),
34+
REFRESH_DEVELOPER_TOKEN(true, LIVE_MANAGEMENT_SERVICE),
3535

3636
//roles
37-
ADD_ROLE(true, LIVE_SERVICE),
38-
REMOVE_ROLE(true, LIVE_SERVICE),
39-
GET_ROLES(true, LIVE_SERVICE),
40-
GET_DEVELOPER_ROLES(true, LIVE_SERVICE),
41-
ADD_DEVELOPER_ROLE(true, LIVE_SERVICE),
42-
REMOVE_DEVELOPER_ROLE(true, LIVE_SERVICE),
37+
ADD_ROLE(true, LIVE_MANAGEMENT_SERVICE),
38+
REMOVE_ROLE(true, LIVE_MANAGEMENT_SERVICE),
39+
GET_ROLES(true, LIVE_MANAGEMENT_SERVICE),
40+
GET_DEVELOPER_ROLES(true, LIVE_MANAGEMENT_SERVICE),
41+
ADD_DEVELOPER_ROLE(true, LIVE_MANAGEMENT_SERVICE),
42+
REMOVE_DEVELOPER_ROLE(true, LIVE_MANAGEMENT_SERVICE),
4343

4444
//permissions
45-
GET_DEVELOPER_PERMISSIONS(true, LIVE_SERVICE),
46-
GET_ROLE_PERMISSIONS(true, LIVE_SERVICE),
47-
ADD_ROLE_PERMISSION(true, LIVE_SERVICE),
48-
REMOVE_ROLE_PERMISSION(true, LIVE_SERVICE),
45+
GET_DEVELOPER_PERMISSIONS(true, LIVE_MANAGEMENT_SERVICE),
46+
GET_ROLE_PERMISSIONS(true, LIVE_MANAGEMENT_SERVICE),
47+
ADD_ROLE_PERMISSION(true, LIVE_MANAGEMENT_SERVICE),
48+
REMOVE_ROLE_PERMISSION(true, LIVE_MANAGEMENT_SERVICE),
4949

5050
//instrument access
51-
GET_ACCESS_PERMISSIONS(true, LIVE_SERVICE),
52-
GET_DATA_REDACTIONS(true, LIVE_SERVICE),
53-
UPDATE_DATA_REDACTION(true, LIVE_SERVICE),
54-
ADD_ACCESS_PERMISSION(true, LIVE_SERVICE),
55-
REMOVE_ACCESS_PERMISSION(true, LIVE_SERVICE),
51+
GET_ACCESS_PERMISSIONS(true, LIVE_MANAGEMENT_SERVICE),
52+
GET_DATA_REDACTIONS(true, LIVE_MANAGEMENT_SERVICE),
53+
UPDATE_DATA_REDACTION(true, LIVE_MANAGEMENT_SERVICE),
54+
ADD_ACCESS_PERMISSION(true, LIVE_MANAGEMENT_SERVICE),
55+
REMOVE_ACCESS_PERMISSION(true, LIVE_MANAGEMENT_SERVICE),
5656

5757
//instruments
5858
ADD_LIVE_BREAKPOINT(false, LIVE_INSTRUMENT),

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ object SourceServices {
2929

3030
object Utilize {
3131
const val LIVE_MANAGEMENT_SERVICE = "spp.service.live-management-service"
32-
const val LIVE_SERVICE = "spp.service.live-service"
3332
const val LIVE_INSTRUMENT = "spp.service.live-instrument"
3433
const val LIVE_VIEW = "spp.service.live-view"
3534
}

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,13 @@ import io.vertx.codegen.annotations.VertxGen
2222
import io.vertx.core.Future
2323
import io.vertx.core.Vertx
2424
import io.vertx.core.eventbus.DeliveryOptions
25+
import io.vertx.core.json.JsonObject
2526
import spp.protocol.SourceServices.Utilize.LIVE_MANAGEMENT_SERVICE
2627
import spp.protocol.platform.auth.ClientAccess
2728
import spp.protocol.platform.auth.RolePermission
29+
import spp.protocol.platform.developer.SelfInfo
30+
import spp.protocol.platform.general.Service
31+
import spp.protocol.platform.status.ActiveInstance
2832

2933

3034
/**
@@ -53,4 +57,10 @@ interface LiveManagementService {
5357
fun addClientAccess(): Future<ClientAccess>
5458
fun removeClientAccess(id: String): Future<Boolean>
5559
fun updateClientAccess(id: String): Future<ClientAccess>
60+
61+
fun getClients(): Future<JsonObject>
62+
fun getStats(): Future<JsonObject>
63+
fun getSelf(): Future<SelfInfo>
64+
fun getServices(): Future<List<Service>>
65+
fun getActiveProbes(): Future<List<ActiveInstance>>
5666
}

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

Lines changed: 0 additions & 56 deletions
This file was deleted.

0 commit comments

Comments
 (0)