From 2060cc9359a382ba65a37b4d62a66f7a33fb623a Mon Sep 17 00:00:00 2001 From: Hugo Arregui Date: Mon, 31 Jul 2023 11:30:26 -0300 Subject: [PATCH 01/11] chore: add dependabot (#166) add dependabot --- .github/dependabot.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 .github/dependabot.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 00000000..eab97cd4 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,12 @@ +version: 2 +updates: +- package-ecosystem: npm + directory: "/" + schedule: + interval: weekly + day: monday + time: "09:00" + timezone: "America/Buenos_Aires" + versioning-strategy: auto + commit-message: + prefix: "chore: " From c36ca280ec58faea1c8d5555bbb65c18f4454a67 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 31 Jul 2023 11:41:22 -0300 Subject: [PATCH 02/11] chore: bump @dcl/ts-proto from 1.153.0 to 1.154.0 (#167) Bumps [@dcl/ts-proto](https://github.com/decentraland/ts-proto) from 1.153.0 to 1.154.0. - [Release notes](https://github.com/decentraland/ts-proto/releases) - [Changelog](https://github.com/decentraland/ts-proto/blob/main/CHANGELOG.md) - [Commits](https://github.com/decentraland/ts-proto/compare/1.153.0...1.154.0) --- updated-dependencies: - dependency-name: "@dcl/ts-proto" dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 4e626003..4c00b271 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ "protocVersion": "22.2" }, "dependencies": { - "@dcl/ts-proto": "1.153.0" + "@dcl/ts-proto": "1.154.0" }, "files": [ "proto", From 9d3834afb77be47710801448bed0014de6f389c2 Mon Sep 17 00:00:00 2001 From: pbosio Date: Tue, 1 Aug 2023 13:51:41 -0300 Subject: [PATCH 03/11] fix: add `PI_OPEN_EXTERNAL_LINK` scene permission (#168) --- proto/decentraland/kernel/apis/permissions.proto | 1 + 1 file changed, 1 insertion(+) diff --git a/proto/decentraland/kernel/apis/permissions.proto b/proto/decentraland/kernel/apis/permissions.proto index 7202245d..41d5875d 100644 --- a/proto/decentraland/kernel/apis/permissions.proto +++ b/proto/decentraland/kernel/apis/permissions.proto @@ -9,6 +9,7 @@ enum PermissionItem { PI_USE_WEBSOCKET = 3; PI_USE_FETCH = 4; PI_ALLOW_MEDIA_HOSTNAMES = 5; + PI_OPEN_EXTERNAL_LINK = 6; } message PermissionResponse { From 921fc5dbaa605e91df2c856f7485a99a508f2396 Mon Sep 17 00:00:00 2001 From: pbosio Date: Thu, 3 Aug 2023 11:28:56 -0300 Subject: [PATCH 04/11] feat: add `CommsApiService` to kernel's api (#164) --- proto/decentraland/kernel/apis/comms_api.proto | 18 ++++++++++++++++++ public/sdk-apis.proto | 1 + 2 files changed, 19 insertions(+) create mode 100644 proto/decentraland/kernel/apis/comms_api.proto diff --git a/proto/decentraland/kernel/apis/comms_api.proto b/proto/decentraland/kernel/apis/comms_api.proto new file mode 100644 index 00000000..9a41533e --- /dev/null +++ b/proto/decentraland/kernel/apis/comms_api.proto @@ -0,0 +1,18 @@ +syntax = "proto3"; +package decentraland.kernel.apis; + +message VideoTracksActiveStreamsRequest { +} + +message VideoTracksActiveStreamsResponse { + repeated VideoTracksActiveStreamsData streams = 1; +} + +message VideoTracksActiveStreamsData { + string identity = 1; + string track_sid = 2; +} + +service CommsApiService { + rpc GetActiveVideoStreams(VideoTracksActiveStreamsRequest) returns (VideoTracksActiveStreamsResponse) {} +} \ No newline at end of file diff --git a/public/sdk-apis.proto b/public/sdk-apis.proto index b1edae3b..ab621be3 100644 --- a/public/sdk-apis.proto +++ b/public/sdk-apis.proto @@ -22,3 +22,4 @@ import public "decentraland/kernel/apis/social_controller.proto"; import public "decentraland/kernel/apis/user_action_module.proto"; import public "decentraland/kernel/apis/user_identity.proto"; import public "decentraland/kernel/apis/scene.proto"; +import public "decentraland/kernel/apis/comms_api.proto"; From 4ee6d08761d6fcf636c0cb1f9f812835ce8c56c0 Mon Sep 17 00:00:00 2001 From: menduz Date: Wed, 9 Aug 2023 07:25:40 -0700 Subject: [PATCH 05/11] Glossiness is deprecated in the PBR spec (#155) Use specular instead. Living spec: https://github.com/KhronosGroup/glTF/tree/main/extensions/2.0/Khronos/KHR_materials_specular Archived spec: https://github.com/KhronosGroup/glTF/blob/main/extensions/2.0/Archived/KHR_materials_pbrSpecularGlossiness/README.md Signed-off-by: menduz Co-authored-by: Lean Mendoza --- proto/decentraland/sdk/components/material.proto | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/proto/decentraland/sdk/components/material.proto b/proto/decentraland/sdk/components/material.proto index 24c9d200..65a98bc8 100644 --- a/proto/decentraland/sdk/components/material.proto +++ b/proto/decentraland/sdk/components/material.proto @@ -42,7 +42,7 @@ message PBMaterial { optional float metallic = 11; // default = 0.5 optional float roughness = 12; // default = 0.5 - optional float glossiness = 13; // default = 1 + reserved 13; optional float specular_intensity = 14; // default = 1 optional float emissive_intensity = 15; // default = 2 From 80255769e81c9b66ecb5057487e5ce31de7496b6 Mon Sep 17 00:00:00 2001 From: pbosio Date: Wed, 9 Aug 2023 14:17:17 -0300 Subject: [PATCH 06/11] fix: add `source_type` to `VideoTracksActiveStreamsData` from `CommsApi` (#170) --- proto/decentraland/kernel/apis/comms_api.proto | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/proto/decentraland/kernel/apis/comms_api.proto b/proto/decentraland/kernel/apis/comms_api.proto index 9a41533e..4288fe71 100644 --- a/proto/decentraland/kernel/apis/comms_api.proto +++ b/proto/decentraland/kernel/apis/comms_api.proto @@ -1,6 +1,12 @@ syntax = "proto3"; package decentraland.kernel.apis; +enum VideoTrackSourceType { + VTST_UNKNOWN = 0; + VTST_CAMERA = 1; + VTST_SCREEN_SHARE = 2; +} + message VideoTracksActiveStreamsRequest { } @@ -11,6 +17,7 @@ message VideoTracksActiveStreamsResponse { message VideoTracksActiveStreamsData { string identity = 1; string track_sid = 2; + VideoTrackSourceType source_type = 3; } service CommsApiService { From b3b5ebfeb9468854c4d492df514113421a572916 Mon Sep 17 00:00:00 2001 From: Lean Mendoza Date: Thu, 10 Aug 2023 14:23:13 -0300 Subject: [PATCH 07/11] feat: (sdk) add player and avatar components (#161) * feat: (sdk) add player and avatar comnponents * make EmoteCommand simpler * update with ADR 245 * fix comment * fix sdk-components --- .../sdk/components/avatar_base.proto | 15 +++++++++++++++ .../sdk/components/avatar_emote_command.proto | 16 ++++++++++++++++ .../sdk/components/avatar_equipped_data.proto | 13 +++++++++++++ .../sdk/components/player_identity_data.proto | 13 +++++++++++++ public/sdk-components.proto | 5 ++++- 5 files changed, 61 insertions(+), 1 deletion(-) create mode 100644 proto/decentraland/sdk/components/avatar_base.proto create mode 100644 proto/decentraland/sdk/components/avatar_emote_command.proto create mode 100644 proto/decentraland/sdk/components/avatar_equipped_data.proto create mode 100644 proto/decentraland/sdk/components/player_identity_data.proto diff --git a/proto/decentraland/sdk/components/avatar_base.proto b/proto/decentraland/sdk/components/avatar_base.proto new file mode 100644 index 00000000..97b2fb1f --- /dev/null +++ b/proto/decentraland/sdk/components/avatar_base.proto @@ -0,0 +1,15 @@ + +syntax = "proto3"; +package decentraland.sdk.components; +import "decentraland/common/colors.proto"; +import "decentraland/sdk/components/common/id.proto"; +option (common.ecs_component_id) = 1087; + +// AvatarBase sets all modifiers over the avatar's apparence. +message PBAvatarBase { + decentraland.common.Color3 skin_color = 1; + decentraland.common.Color3 eyes_color = 2; + decentraland.common.Color3 hair_color = 3; + string body_shape_urn = 4; + string name = 5; +} \ No newline at end of file diff --git a/proto/decentraland/sdk/components/avatar_emote_command.proto b/proto/decentraland/sdk/components/avatar_emote_command.proto new file mode 100644 index 00000000..03f94742 --- /dev/null +++ b/proto/decentraland/sdk/components/avatar_emote_command.proto @@ -0,0 +1,16 @@ +syntax = "proto3"; +package decentraland.sdk.components; + +import "decentraland/sdk/components/common/id.proto"; +option (common.ecs_component_id) = 1088; + +// AvatarEmoteCommand is a grow only value set, used to signal the renderer about +// avatar emotes playback. +message PBAvatarEmoteCommand { + message EmoteCommand { + string emote_urn = 1; + bool loop = 2; + } + + EmoteCommand emote_command = 1; +} \ No newline at end of file diff --git a/proto/decentraland/sdk/components/avatar_equipped_data.proto b/proto/decentraland/sdk/components/avatar_equipped_data.proto new file mode 100644 index 00000000..74087df5 --- /dev/null +++ b/proto/decentraland/sdk/components/avatar_equipped_data.proto @@ -0,0 +1,13 @@ +syntax = "proto3"; +package decentraland.sdk.components; + +import "decentraland/sdk/components/common/id.proto"; +option (common.ecs_component_id) = 1091; + +// AvatarEquipData is used to read the information about the avatar's owneables. +// this component is written by the engine using the communications transports' +// data. +message PBAvatarEquippedData { + repeated string wearable_urns = 1; + repeated string emotes_urns = 2; +} \ No newline at end of file diff --git a/proto/decentraland/sdk/components/player_identity_data.proto b/proto/decentraland/sdk/components/player_identity_data.proto new file mode 100644 index 00000000..68cba08c --- /dev/null +++ b/proto/decentraland/sdk/components/player_identity_data.proto @@ -0,0 +1,13 @@ +syntax = "proto3"; +package decentraland.sdk.components; + +import "decentraland/sdk/components/common/id.proto"; +option (common.ecs_component_id) = 1089; + +// PlayerIdentityData is used to read the information about the avatar's +// identity. this component is written by the engine using the communications +// transports' data. +message PBPlayerIdentityData { + string address = 1; // ethereum address of this player + bool is_guest = 3; +} \ No newline at end of file diff --git a/public/sdk-components.proto b/public/sdk-components.proto index daad5f28..ee9cf13f 100644 --- a/public/sdk-components.proto +++ b/public/sdk-components.proto @@ -1,11 +1,13 @@ syntax = "proto3"; package decentraland.sdk.components; - import public "decentraland/sdk/components/animator.proto"; import public "decentraland/sdk/components/audio_source.proto"; import public "decentraland/sdk/components/audio_stream.proto"; import public "decentraland/sdk/components/avatar_attach.proto"; +import public "decentraland/sdk/components/avatar_base.proto"; +import public "decentraland/sdk/components/avatar_emote_command.proto"; +import public "decentraland/sdk/components/avatar_equipped_data.proto"; import public "decentraland/sdk/components/avatar_modifier_area.proto"; import public "decentraland/sdk/components/avatar_shape.proto"; import public "decentraland/sdk/components/billboard.proto"; @@ -18,6 +20,7 @@ import public "decentraland/sdk/components/material.proto"; import public "decentraland/sdk/components/mesh_collider.proto"; import public "decentraland/sdk/components/mesh_renderer.proto"; import public "decentraland/sdk/components/nft_shape.proto"; +import public "decentraland/sdk/components/player_identity_data.proto"; import public "decentraland/sdk/components/pointer_events_result.proto"; import public "decentraland/sdk/components/pointer_events.proto"; import public "decentraland/sdk/components/pointer_lock.proto"; From 03626d76db879afcdfd4fbcdc0342a04e5b4f663 Mon Sep 17 00:00:00 2001 From: Lautaro Bustos Date: Tue, 12 Sep 2023 11:15:19 -0300 Subject: [PATCH 08/11] feat: add quests proto (#173) --- proto/decentraland/quests/definitions.proto | 185 ++++++++++++++++++++ 1 file changed, 185 insertions(+) create mode 100644 proto/decentraland/quests/definitions.proto diff --git a/proto/decentraland/quests/definitions.proto b/proto/decentraland/quests/definitions.proto new file mode 100644 index 00000000..0704fb98 --- /dev/null +++ b/proto/decentraland/quests/definitions.proto @@ -0,0 +1,185 @@ +syntax = "proto3"; +package decentraland.quests; + +import "google/protobuf/empty.proto"; + +// Errors +message InvalidQuest {} + +message NotUUID {} + +message InternalServerError {} + +message NotFoundQuestInstance {} + +message QuestAlreadyStarted {} + +message NotOwner {} + +message IgnoredEvent {} + +message StartQuestRequest { + string quest_id = 1; +} + +message StartQuestResponse { + /* There are a few valid reasons to not be accepted: + * - Quest is not found + * - Quest is deactivated (the owner deleted it) + * - User already started the quest + * - Internal errors (DB connection failed or something like that) */ + message Accepted {} + oneof response { + Accepted accepted = 1; + InvalidQuest invalid_quest = 2; + NotUUID not_uuid_error = 3; + InternalServerError internal_server_error = 4; + QuestAlreadyStarted quest_already_started = 5; + } +} + +message AbortQuestRequest { + string quest_instance_id = 1; +} + +message AbortQuestResponse { + /* There are a few valid reasons to not be accepted: + * - Quest instance is not found + * - Quest instance is from another user + * - Quest instance already aborted + * - Internal errors (DB connection failed or something like that) */ + message Accepted {} + oneof response { + Accepted accepted = 1; + NotFoundQuestInstance not_found_quest_instance = 2; + NotUUID not_uuid_error = 3; + NotOwner not_owner = 4; + InternalServerError internal_server_error = 5; + } +} + +message Event { + string id = 1; + string address = 2; + Action action = 3; +} + +message EventRequest { + Action action = 1; +} + +message EventResponse { + oneof response { + string accepted_event_id = 1; + IgnoredEvent ignored_event = 2; + InternalServerError internal_server_error = 3; + } +} + +message QuestDefinition { + repeated Step steps = 1; + repeated Connection connections = 2; +} + +message Connection { + string step_from = 1; + string step_to = 2; +} + +message Step { + string id = 1; + string description = 2; + repeated Task tasks = 3; +} + +message Action { + string type = 1; + map parameters = 2; +} + +message Task { + string id = 1; + string description = 2; + repeated Action action_items = 3; +} + +message StepContent { + repeated Task to_dos = 1; + repeated Task tasks_completed = 2; +} + +message QuestState { + map current_steps = 2; + fixed32 steps_left = 3; + repeated string steps_completed = 4; + repeated string required_steps = 5; +} + +message Quest { + string id = 1; + string name = 2; + string description = 3; + QuestDefinition definition = 4; + string creator_address = 5; + string image_url = 6; + bool active = 7; + fixed32 created_at = 8; +} + +message QuestInstance { + string id = 1; + Quest quest = 2; + QuestState state = 3; +} + +message QuestStateUpdate { + string instance_id = 1; + QuestState quest_state = 2; + string event_id = 3; +} + +message UserUpdate { + oneof message { + bool subscribed = 1; + QuestStateUpdate quest_state_update = 2; + QuestInstance new_quest_started = 3; + string event_ignored = 4; + } + string user_address = 5; +} + +message Quests { + repeated QuestInstance instances = 1; +} + +message GetAllQuestsResponse { + oneof response { + Quests quests = 1; + InternalServerError internal_server_error = 2; + } +} + +message GetQuestDefinitionRequest { + string quest_id = 1; +} + +message GetQuestDefinitionResponse { + oneof response { + Quest quest = 1; + InternalServerError internal_server_error = 2; + } +} + +service QuestsService { + // User actions + rpc StartQuest(StartQuestRequest) returns (StartQuestResponse) {} + rpc AbortQuest(AbortQuestRequest) returns (AbortQuestResponse) {} + rpc SendEvent(EventRequest) returns (EventResponse) {} + + // Listen to changes in quest states and event processing updates + rpc Subscribe(google.protobuf.Empty) returns (stream UserUpdate) {} + + // Query quest information + rpc GetAllQuests(google.protobuf.Empty) returns (GetAllQuestsResponse) {} + rpc GetQuestDefinition(GetQuestDefinitionRequest) returns (GetQuestDefinitionResponse) {} +} \ No newline at end of file From 75f18e8094a0435594eecfbb6e020614b2a86c69 Mon Sep 17 00:00:00 2001 From: Gon Pombo Date: Fri, 15 Sep 2023 12:56:19 -0300 Subject: [PATCH 09/11] add is server API for sync servers (#174) --- proto/decentraland/kernel/apis/engine_api.proto | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/proto/decentraland/kernel/apis/engine_api.proto b/proto/decentraland/kernel/apis/engine_api.proto index 5123ccac..d5207f98 100644 --- a/proto/decentraland/kernel/apis/engine_api.proto +++ b/proto/decentraland/kernel/apis/engine_api.proto @@ -88,6 +88,11 @@ message CrdtMessageFromRendererResponse { repeated bytes data = 1; } +message IsServerRequest {} +message IsServerResponse { + bool is_server = 1; +} + service EngineApiService { // support for legacy SDK events. @@ -108,4 +113,6 @@ service EngineApiService { // @deprecated, this response was merged into CrdtSendToResponse rpc CrdtGetMessageFromRenderer(CrdtMessageFromRendererRequest) returns (CrdtMessageFromRendererResponse) {} + + rpc IsServer(IsServerRequest) returns (IsServerResponse) {} } From 438d6b3eb0fadd1b352b9e68880bd5bcab8f16d0 Mon Sep 17 00:00:00 2001 From: Mateo Miccino Date: Tue, 26 Sep 2023 10:16:36 -0300 Subject: [PATCH 10/11] refactor: remove unused bff protos (#177) --- README.md | 12 +-- .../bff/authentication_service.proto | 39 --------- .../bff/comms_director_service.proto | 33 -------- proto/decentraland/bff/comms_service.proto | 25 ------ proto/decentraland/bff/http_endpoints.proto | 81 ------------------- proto/decentraland/bff/topics_service.proto | 34 -------- public/bff-services.proto | 16 ---- 7 files changed, 1 insertion(+), 239 deletions(-) delete mode 100644 proto/decentraland/bff/authentication_service.proto delete mode 100644 proto/decentraland/bff/comms_director_service.proto delete mode 100644 proto/decentraland/bff/comms_service.proto delete mode 100644 proto/decentraland/bff/http_endpoints.proto delete mode 100644 proto/decentraland/bff/topics_service.proto delete mode 100644 public/bff-services.proto diff --git a/README.md b/README.md index 0bf501ad..598bdb0b 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ protoc \ --dcl_ts_proto_out="$(pwd)/out-ts" \ -I="$(pwd)/node_modules/@dcl/protocol/public" \ -I="$(pwd)/node_modules/@dcl/protocol/proto" \ - "$(pwd)/node_modules/@dcl/protocol/public/bff-services.proto" + "$(pwd)/node_modules/@dcl/protocol/public/sdk-components.proto" ``` # Style Guidelines @@ -64,16 +64,6 @@ Some guidelines and testing before merge: Repositories: [kernel](https://github.com/decentraland/kernel/), [js-sdk-toolchain](https://github.com/decentraland/js-sdk-toolchain/) and [scene-runtime](https://github.com/decentraland/scene-runtime/) In this case, there is no problem with when each PR is merged. It's recommendable to merge first the rpc server-side (in this case, Kernel), second the `scene-runtime` (and this would require a second update from `kernel`) and last the `js-sdk-toolchain`. -## Renderer protocol (RPC) - -Repositories: [kernel](https://github.com/decentraland/kernel/) and [unity-renderer](https://github.com/decentraland/unity-renderer/) - -TODO - -## BFF - -TODO - ## Comms TODO diff --git a/proto/decentraland/bff/authentication_service.proto b/proto/decentraland/bff/authentication_service.proto deleted file mode 100644 index 2df28cb5..00000000 --- a/proto/decentraland/bff/authentication_service.proto +++ /dev/null @@ -1,39 +0,0 @@ -syntax = "proto3"; - -import "google/protobuf/empty.proto"; - -package decentraland.bff; - -enum DisconnectionReason { - DR_KICKED = 0; -} - -message GetChallengeRequest { - string address = 1; -} - -message GetChallengeResponse { - string challenge_to_sign = 1; - bool already_connected = 2; -} - -message SignedChallenge { - string auth_chain_json = 1; -} - -message WelcomePeerInformation { - string peer_id = 1; - - // list of available modules in this BFF - repeated string available_modules = 2; -} - -message DisconnectionMessage { - DisconnectionReason reason = 1; -} - -service BffAuthenticationService { - rpc GetChallenge(GetChallengeRequest) returns (GetChallengeResponse) {} - rpc Authenticate(SignedChallenge) returns (WelcomePeerInformation) {} - rpc GetDisconnectionMessage(google.protobuf.Empty) returns (DisconnectionMessage) {} -} diff --git a/proto/decentraland/bff/comms_director_service.proto b/proto/decentraland/bff/comms_director_service.proto deleted file mode 100644 index 345a7ba3..00000000 --- a/proto/decentraland/bff/comms_director_service.proto +++ /dev/null @@ -1,33 +0,0 @@ -syntax = "proto3"; - -// CommsDirector are formalized at https://rfc.decentraland.org/adr/ADR-81 - -import "google/protobuf/empty.proto"; -import "decentraland/common/vectors.proto"; - -package decentraland.bff; - -message WorldCommand { - oneof command { - SetCommsAdapter set_comms_adapter = 1; - } -} - -message SetCommsAdapter { - string connection_string = 1; -} - -message Heartbeat { - decentraland.common.Position position = 1; - optional string desired_room = 2; -} - -service CommsDirectorService { - // every couple seconds AND at the beginning, the explorers must send a heartbeat - // to make the comms director aware of their location - rpc SendHeartbeat(Heartbeat) returns (google.protobuf.Empty) {} - - // before sending the first heartbeat, it is required that the explorers subscribe - // to a list of comms commands - rpc GetCommsCommands(google.protobuf.Empty) returns (stream WorldCommand) {} -} diff --git a/proto/decentraland/bff/comms_service.proto b/proto/decentraland/bff/comms_service.proto deleted file mode 100644 index e261bc48..00000000 --- a/proto/decentraland/bff/comms_service.proto +++ /dev/null @@ -1,25 +0,0 @@ -syntax = "proto3"; -package decentraland.bff; - -import "decentraland/bff/topics_service.proto"; - -message Subscription { - uint32 subscription_id = 1; -} - -message UnsubscriptionResult { - bool ok = 1; -} - -service CommsService { - rpc SubscribeToPeerMessages(SubscriptionRequest) returns (Subscription) {} - rpc GetPeerMessages(Subscription) returns (stream PeerTopicSubscriptionResultElem) {} - rpc UnsubscribeToPeerMessages(Subscription) returns (UnsubscriptionResult) {} - - rpc SubscribeToSystemMessages(SubscriptionRequest) returns (Subscription) {} - rpc GetSystemMessages(Subscription) returns (stream SystemTopicSubscriptionResultElem) {} - rpc UnsubscribeToSystemMessages(Subscription) returns (UnsubscriptionResult) {} - - // send a peer message to a topic - rpc PublishToTopic(PublishToTopicRequest) returns (PublishToTopicResult) {} -} \ No newline at end of file diff --git a/proto/decentraland/bff/http_endpoints.proto b/proto/decentraland/bff/http_endpoints.proto deleted file mode 100644 index a017eb60..00000000 --- a/proto/decentraland/bff/http_endpoints.proto +++ /dev/null @@ -1,81 +0,0 @@ -syntax = "proto3"; -package decentraland.bff; - -import "google/protobuf/empty.proto"; - -message AboutResponse { - bool healthy = 1; - AboutConfiguration configurations = 2; - ContentInfo content = 3; - CommsInfo comms = 4; - LambdasInfo lambdas = 5; - optional BffInfo bff = 6; - bool accepting_users = 7; - - message MinimapConfiguration { - bool enabled = 1; - optional string data_image = 2; - optional string estate_image = 3; - } - - message SkyboxConfiguration { - // only one value at a time - optional float fixed_hour = 1; - repeated string textures = 2; - } - - message AboutConfiguration { - optional string realm_name = 1; - uint32 network_id = 2; - repeated string global_scenes_urn = 3; - repeated string scenes_urn = 4; - optional MinimapConfiguration minimap = 5; - optional SkyboxConfiguration skybox = 6; - - // A content server to be used to load the parcels around the user. Uses the POST /entities/active endpoint - // to continously fetch the parcels around the users. if null, then the default content server will be used - // if == "" then the city_loader will be disabled and the scenes_urn will be used to load the world - optional string city_loader_content_server = 7; - } - - message ContentInfo { - // common properties - bool healthy = 1; - optional string version = 2; - optional string commit_hash = 3; - string public_url = 4; - } - message LambdasInfo { - // common properties - bool healthy = 1; - optional string version = 2; - optional string commit_hash = 3; - string public_url = 4; - } - message CommsInfo { - // common properties - bool healthy = 1; - optional string version = 2; - optional string commit_hash = 3; - optional string public_url = 4; - // specific properties - string protocol = 50; - optional int32 users_count = 51; - optional string fixed_adapter = 52; - } - message BffInfo { - // common properties - bool healthy = 1; - optional string version = 2; - optional string commit_hash = 3; - string public_url = 4; - // specific properties - optional int32 user_count = 51; - optional string protocol_version = 52; - } -} - -service HttpEndpoints { - // Returns the status and configuration of the bff microservice - rpc About(google.protobuf.Empty) returns (AboutResponse) {} -} diff --git a/proto/decentraland/bff/topics_service.proto b/proto/decentraland/bff/topics_service.proto deleted file mode 100644 index 6f0ad32b..00000000 --- a/proto/decentraland/bff/topics_service.proto +++ /dev/null @@ -1,34 +0,0 @@ -syntax = "proto3"; -package decentraland.bff; - -message SubscriptionRequest { - string topic = 1; -} - -message PeerTopicSubscriptionResultElem { - bytes payload = 1; - string topic = 2; - string sender = 3; -} - -message SystemTopicSubscriptionResultElem { - bytes payload = 1; - string topic = 2; -} - -message PublishToTopicRequest { - string topic = 1; - bytes payload = 2; -} - -message PublishToTopicResult { - bool ok = 1; -} - -service TopicsService { - rpc PeerSubscription(SubscriptionRequest) returns (stream PeerTopicSubscriptionResultElem) {} - rpc SystemSubscription(SubscriptionRequest) returns (stream SystemTopicSubscriptionResultElem) {} - - // send a peer message to a topic - rpc PublishToTopic(PublishToTopicRequest) returns (PublishToTopicResult) {} -} diff --git a/public/bff-services.proto b/public/bff-services.proto deleted file mode 100644 index 57baad1a..00000000 --- a/public/bff-services.proto +++ /dev/null @@ -1,16 +0,0 @@ -syntax = "proto3"; - -// This version is used to check compatibility between Kernel<>BFF -// Update it manually using semantic versioning. Patches may be skipped. -package v1_0_0; - -// This file only imports all the services for the BFF to help the compiler -// resolve all dependencies - -import public "decentraland/bff/authentication_service.proto"; -import public "decentraland/bff/http_endpoints.proto"; -import public "decentraland/bff/topics_service.proto"; -import public "decentraland/bff/comms_director_service.proto"; - -// TO BE DELETED -import public "decentraland/bff/comms_service.proto"; \ No newline at end of file From a9a962adc727481961dad2d379121a912672cae5 Mon Sep 17 00:00:00 2001 From: pbosio Date: Tue, 26 Sep 2023 11:50:38 -0300 Subject: [PATCH 11/11] fix: deprecate Animator's state name property (#178) --- proto/decentraland/sdk/components/animator.proto | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/proto/decentraland/sdk/components/animator.proto b/proto/decentraland/sdk/components/animator.proto index 6e51ef0b..b7649aec 100644 --- a/proto/decentraland/sdk/components/animator.proto +++ b/proto/decentraland/sdk/components/animator.proto @@ -16,7 +16,7 @@ message PBAnimator { // AnimationState indicates the status and configuration of one available animation. message PBAnimationState { - string name = 1; // the identifier for this animation, to use in scene code + reserved 1; // deprecated `name` prop string clip = 2; // the animation path in the `files` array of the scene manifest optional bool playing = 3; // whether this animation is currently playing optional float weight = 4; // the "weight" of this animation (see below, default: 1.0)