@dcl/protocol 1.0.0-16428499484.commit-7aab7c2 → 1.0.0-16564528964.commit-5630df7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcl/protocol",
-  "version": "1.0.0-16428499484.commit-7aab7c2",
+  "version": "1.0.0-16564528964.commit-5630df7",
   "description": "",
   "repository": "decentraland/protocol.git",
   "homepage": "https://github.com/decentraland/protocol#readme",
@@ -13,7 +13,7 @@
     "test": "./scripts/check-proto-compabitility.sh"
   },
   "devDependencies": {
-    "@protobuf-ts/protoc": "^2.8.1",
+    "@protobuf-ts/protoc": "^2.11.0",
     "proto-compatibility-tool": "^1.1.2-20220925163655.commit-25bd040",
     "typescript": "^5.0.4"
   },
@@ -30,5 +30,5 @@
     "out-js",
     "public"
   ],
-  "commit": "7aab7c2283cf58d6bfa82ac990af42933526ef45"
+  "commit": "5630df76f6558e779d7819062ffcc98299a3fd86"
 }

package/proto/decentraland/kernel/comms/rfc4/comms.proto

@@ -55,10 +55,11 @@ message Movement {
   bool is_long_jump = 12;
   bool is_long_fall = 13;
   bool is_falling = 14;
-
   bool is_stunned = 15;
-  
   float rotation_y = 16;
+  // interpolation
+  bool is_instant = 17;
+  bool is_emoting = 18;
 }
 
 message MovementCompressed {
@@ -67,7 +68,7 @@ message MovementCompressed {
 }
 
 message PlayerEmote {
-  uint32 incremental_id = 1;
+  float timestamp = 1;
   string urn = 2;
 }
 
@@ -101,6 +102,10 @@ message ProfileResponse {
 message Chat {
   string message = 1;
   double timestamp = 2;
+
+  // Extension: optional forwarded_from to identify the original sender when
+  // messages are forwarded through an SFU
+  optional string forwarded_from = 3;
 }
 
 message Scene {

package/proto/decentraland/sdk/components/light_source.proto

@@ -0,0 +1,28 @@
+syntax = "proto3";
+package decentraland.sdk.components;
+import "decentraland/sdk/components/common/id.proto";
+import "decentraland/common/colors.proto";
+import "decentraland/common/texture.proto";
+option (common.ecs_component_id) = 1079;
+
+message PBLightSource {
+  optional bool active = 1;                                           // default = true, whether the lightSource is active or not.
+  optional decentraland.common.Color3 color = 2;                      // default = Color.white, the tint of the light, in RGB format where each component is a floating point value with a range from 0 to 1.
+  optional float intensity = 3;                                       // default = 250, ranges from 1 (dim) to 100,000 (very bright), expressed in Lumens for Point and Spot.
+  optional float range = 4;                                           // default = 0, how far the light travels, expressed in meters. If left at 0 will be computed automatically
+  optional bool shadow = 5;                                           // default = false, whether the light casts shadows or not.
+  optional decentraland.common.TextureUnion shadow_mask_texture = 6;  // Texture mask through which shadows are cast to simulate caustics, soft shadows, and light shapes such as light entering from a window.
+
+  oneof type {
+    Point point = 7;
+    Spot spot = 8;
+  }
+
+  message Point {
+  }
+
+  message Spot {
+    optional float inner_angle = 9;   // default = 21.8. Inner angle can't be higher than outer angle, otherwise will default to same value. Min value is 0. Max value is 179.
+    optional float outer_angle = 10;  // default = 30. Outer angle can't be lower than inner angle, otherwise will inner angle will be set to same value. Max value is 179.
+  }
+}

package/proto/decentraland/sdk/components/virtual_camera.proto

@@ -10,7 +10,9 @@ option (common.ecs_component_id) = 1076;
 // an 'instant' transition (like using speed/time = 0)
 // * The lookAtEntity defines to which entity the Camera has to look at constantly (independent from 
 // the holding entity transform).
+// * The fov defines the Field of View of the virtual camera
 message PBVirtualCamera {
   optional common.CameraTransition default_transition = 1;
   optional uint32 look_at_entity = 2;
+  optional float fov = 3; // default: 60
 }

package/proto/decentraland/social_service/v2/social_service_v2.proto

@@ -4,21 +4,56 @@ package decentraland.social_service.v2;
 import "google/protobuf/empty.proto";
 
 // Errors
-message InvalidFriendshipAction {}
-message InternalServerError {}
+message InvalidFriendshipAction {
+  optional string message = 1;
+}
+message InternalServerError {
+  optional string message = 1;
+}
+message InvalidRequest {
+  optional string message = 1;
+}
+message ProfileNotFound {
+  optional string message = 1;
+}
+message ConflictingError {
+  optional string message = 1;
+}
+message ForbiddenError {
+  optional string message = 1;
+}
+message NotFoundError {
+  optional string message = 1;
+}
 
 // Types
 message User { string address = 1; }
 
+message FriendProfile {
+  string address = 1;
+  string name = 2;
+  bool has_claimed_name = 3;
+  string profile_picture_url = 4;
+}
+
+message BlockedUserProfile {
+  string address = 1;
+  string name = 2;
+  bool has_claimed_name = 3;
+  string profile_picture_url = 4;
+  optional int64 blocked_at = 5;
+}
+
 message Pagination {
   int32 limit = 1;
   int32 offset = 2;
 }
 
 message FriendshipRequestResponse {
-  User user = 1;
+  FriendProfile friend = 1;
   int64 created_at = 2;
   optional string message = 3;
+  string id = 4;
 }
 
 message FriendshipRequests {
@@ -33,7 +68,6 @@ enum ConnectivityStatus {
 
 message GetFriendsPayload {
   optional Pagination pagination = 1;
-  optional ConnectivityStatus status = 2;
 }
 
 message GetFriendshipRequestsPayload {
@@ -69,8 +103,8 @@ message PaginatedResponse {
   int32 page = 2;
 }
 
-message PaginatedUsersResponse {
-  repeated User users = 1;
+message PaginatedFriendsProfilesResponse {
+  repeated FriendProfile friends = 1;
   PaginatedResponse pagination_data = 2;
 }
 
@@ -86,6 +120,8 @@ message UpsertFriendshipResponse {
   message Accepted {
     string id = 1;
     int64 created_at = 2;
+    FriendProfile friend = 3;
+    optional string message = 4;
   }
   oneof response {
     Accepted accepted = 1;
@@ -95,20 +131,33 @@ message UpsertFriendshipResponse {
 }
 
 message FriendshipUpdate {
+  message RequestResponse {
+    FriendProfile friend = 1;
+    int64 created_at = 2;
+    optional string message = 3;
+    string id = 4;
+  }
   message AcceptResponse { User user = 1; }
   message RejectResponse { User user = 1; }
   message DeleteResponse { User user = 1; }
   message CancelResponse { User user = 1; }
+  message BlockResponse { User user = 1; }
 
   oneof update {
-    FriendshipRequestResponse request = 1;
+    RequestResponse request = 1;
     AcceptResponse accept = 2;
     RejectResponse reject = 3;
     DeleteResponse delete = 4;
     CancelResponse cancel = 5;
+    BlockResponse block = 6;
   }
 }
 
+message FriendConnectivityUpdate {
+  FriendProfile friend = 1;
+  ConnectivityStatus status = 2;
+}
+
 message GetFriendshipStatusPayload {
   User user = 1;
 }
@@ -121,6 +170,8 @@ enum FriendshipStatus {
   REJECTED = 4;
   DELETED = 5;
   BLOCKED = 6;
+  NONE = 7;
+  BLOCKED_BY = 8;
 }
 
 message GetFriendshipStatusResponse {
@@ -134,12 +185,253 @@ message GetFriendshipStatusResponse {
   }
 }
 
+message BlockUserPayload {
+  User user = 1;
+}
+
+message BlockUserResponse {
+  message Ok {
+    BlockedUserProfile profile = 1;
+  }
+
+  oneof response {
+    Ok ok = 1;
+    InternalServerError internal_server_error = 2;
+    InvalidRequest invalid_request = 3;
+    ProfileNotFound profile_not_found = 4;
+  }
+}
+
+message UnblockUserPayload {
+  User user = 1;
+}
+
+message UnblockUserResponse {
+  message Ok {
+    BlockedUserProfile profile = 1;
+  }
+
+  oneof response {
+    Ok ok = 1;
+    InternalServerError internal_server_error = 2;
+    InvalidRequest invalid_request = 3;
+    ProfileNotFound profile_not_found = 4;
+  }
+}
+
+enum PrivateMessagePrivacySetting {
+  ALL = 0;
+  ONLY_FRIENDS = 1;
+}
+
+enum BlockedUsersMessagesVisibilitySetting {
+  SHOW_MESSAGES = 0;
+  DO_NOT_SHOW_MESSAGES = 1;
+}
+
+message SocialSettings {
+  PrivateMessagePrivacySetting private_messages_privacy = 1;
+  BlockedUsersMessagesVisibilitySetting blocked_users_messages_visibility = 2;
+}
+
+message GetSocialSettingsResponse {
+  message Ok {
+    SocialSettings settings = 1;
+  }
+
+  oneof response {
+    Ok ok = 1;
+    InternalServerError internal_server_error = 2;
+  }
+}
+
+message UpsertSocialSettingsPayload {
+  optional PrivateMessagePrivacySetting private_messages_privacy = 1;
+  optional BlockedUsersMessagesVisibilitySetting blocked_users_messages_visibility = 2;
+}
+
+message UpsertSocialSettingsResponse {
+  oneof response {
+    SocialSettings ok = 1;
+    InternalServerError internal_server_error = 2;
+    InvalidRequest invalid_request = 3;
+  }
+}
+
+message GetPrivateMessagesSettingsPayload {
+  repeated User user = 1;
+}
+
+message GetPrivateMessagesSettingsResponse {
+  message PrivateMessagesSettings {
+    User user = 1;
+    PrivateMessagePrivacySetting private_messages_privacy = 2;
+    bool is_friend = 3;
+  }
+
+  message Ok {
+    repeated PrivateMessagesSettings settings = 1;
+  }
+
+  oneof response {
+    Ok ok = 1;
+    InternalServerError internal_server_error = 2;
+    InvalidRequest invalid_request = 3;
+    ProfileNotFound profile_not_found = 4;
+  }
+}
+
+message GetBlockedUsersPayload {
+  optional Pagination pagination = 1;
+}
+
+message GetBlockedUsersResponse {
+  repeated BlockedUserProfile profiles = 1;
+  PaginatedResponse pagination_data = 2;
+}
+
+message GetBlockingStatusResponse {
+  repeated string blocked_users = 1;
+  repeated string blocked_by_users = 2;
+}
+
+message BlockUpdate {
+  string address = 1;
+  bool is_blocked = 2;
+}
+
+message CommunityMemberConnectivityUpdate {
+  string community_id = 1;
+  User member = 2;
+  ConnectivityStatus status = 3;
+}
+
+// Private voice chats
+
+// Starting a private voice chat
+
+message StartPrivateVoiceChatPayload {
+  User callee = 1;
+}
+
+message StartPrivateVoiceChatResponse {
+  message Ok {
+    string call_id = 1;
+  }
+  
+  oneof response {
+    Ok ok = 1;
+    InternalServerError internal_server_error = 2;
+    InvalidRequest invalid_request = 3;
+    ConflictingError conflicting_error = 4;
+    ForbiddenError forbidden_error = 5;
+  }
+}
+
+// Accepting a private voice chat
+
+message AcceptPrivateVoiceChatPayload {
+  string call_id = 1;
+}
+
+message AcceptPrivateVoiceChatResponse {
+  message Ok {
+    string call_id = 1;
+    PrivateVoiceChatCredentials credentials = 2;
+  }
+  
+  oneof response {
+    Ok ok = 1;
+    InternalServerError internal_server_error = 2;
+    InvalidRequest invalid_request = 3;
+    NotFoundError not_found = 4;
+    ForbiddenError forbidden_error = 5;
+  }
+}
+
+// Rejecting a private voice chat
+
+message RejectPrivateVoiceChatPayload {
+  string call_id = 1;
+}
+
+message RejectPrivateVoiceChatResponse {
+  message Ok {
+    string call_id = 1;
+  }
+  
+  oneof response {
+    Ok ok = 1;
+    InternalServerError internal_server_error = 2;
+    InvalidRequest invalid_request = 3;
+    NotFoundError not_found = 4;
+  }
+}
+
+// Private voice chat updates
+
+enum PrivateVoiceChatStatus {
+  VOICE_CHAT_REQUESTED = 0;
+  VOICE_CHAT_ACCEPTED = 1;
+  VOICE_CHAT_REJECTED = 2;
+  VOICE_CHAT_ENDED = 3;
+  VOICE_CHAT_EXPIRED = 4;
+}
+
+message PrivateVoiceChatCredentials {
+  string connection_url = 1;
+}
+
+message PrivateVoiceChatUpdate {
+  string call_id = 1;
+  PrivateVoiceChatStatus status = 2;
+  optional User caller = 3;
+  optional User callee = 4;
+  optional PrivateVoiceChatCredentials credentials = 5;
+}
+
+// Ending a private voice chat
+// This is sent from the client to the server whenever the user wants to end the voice chat
+// This could occur before the voice chat is accepted or after it is accepted
+
+message EndPrivateVoiceChatPayload {
+  string call_id = 1;
+}
+
+message EndPrivateVoiceChatResponse {
+  message Ok {
+    string call_id = 1;
+  }
+  
+  oneof response {
+    Ok ok = 1;
+    InternalServerError internal_server_error = 2;
+    NotFoundError not_found = 3;
+  }
+}
+
+// Get incoming private voice chat request
+
+message GetIncomingPrivateVoiceChatRequestResponse {
+  message Ok {
+    User caller = 1;
+    string call_id = 2;
+  }
+
+  oneof response {
+    Ok ok = 1;
+    NotFoundError not_found = 2;
+    InternalServerError internal_server_error = 3;
+  }
+}
+
+
 service SocialService {  
   // Get the list of friends for the authenticated user
-  rpc GetFriends(GetFriendsPayload) returns (PaginatedUsersResponse) {}
+  rpc GetFriends(GetFriendsPayload) returns (PaginatedFriendsProfilesResponse) {}
 
   // Get the list of mutual friends between the authenticated user and the one in the parameter
-  rpc GetMutualFriends(GetMutualFriendsPayload) returns (PaginatedUsersResponse) {}
+  rpc GetMutualFriends(GetMutualFriendsPayload) returns (PaginatedFriendsProfilesResponse) {}
 
   // Get the pending friendship requests for the authenticated user
   rpc GetPendingFriendshipRequests(GetFriendshipRequestsPayload) returns (PaginatedFriendshipRequestsResponse) {}
@@ -155,5 +447,51 @@ service SocialService {
   rpc SubscribeToFriendshipUpdates(google.protobuf.Empty)
       returns (stream FriendshipUpdate) {}
 
+  // Get the friendship status between the authenticated user and the one in the parameter
   rpc GetFriendshipStatus(GetFriendshipStatusPayload) returns (GetFriendshipStatusResponse) {}
+
+  // Subscribe to connectivity updates of friends: ONLINE, OFFLINE, AWAY
+  rpc SubscribeToFriendConnectivityUpdates(google.protobuf.Empty)
+      returns (stream FriendConnectivityUpdate) {}
+
+  rpc BlockUser(BlockUserPayload) returns (BlockUserResponse) {}
+
+  rpc UnblockUser(UnblockUserPayload) returns (UnblockUserResponse) {}
+
+  rpc GetBlockedUsers(GetBlockedUsersPayload) returns (GetBlockedUsersResponse) {}
+
+  rpc GetBlockingStatus(google.protobuf.Empty) returns (GetBlockingStatusResponse) {}
+
+  rpc SubscribeToBlockUpdates(google.protobuf.Empty) returns (stream BlockUpdate) {}
+  
+  // Get all the social settings for the authenticated user
+  rpc GetSocialSettings(google.protobuf.Empty) returns (GetSocialSettingsResponse) {}
+
+  // Insert or update the social settings for the authenticated user
+  rpc UpsertSocialSettings(UpsertSocialSettingsPayload) returns (UpsertSocialSettingsResponse) {}
+
+  // Get the private messages privacy settings for the requested users
+  rpc GetPrivateMessagesSettings(GetPrivateMessagesSettingsPayload) returns (GetPrivateMessagesSettingsResponse) {}
+
+  // Subscribe to community member connectivity updates: ONLINE, OFFLINE
+  rpc SubscribeToCommunityMemberConnectivityUpdates(google.protobuf.Empty)
+      returns (stream CommunityMemberConnectivityUpdate) {}
+
+  // Start a private voice chat
+  rpc StartPrivateVoiceChat(StartPrivateVoiceChatPayload) returns (StartPrivateVoiceChatResponse) {}
+
+  // Accept a private voice chat
+  rpc AcceptPrivateVoiceChat(AcceptPrivateVoiceChatPayload) returns (AcceptPrivateVoiceChatResponse) {}
+
+  // Reject a private voice chat
+  rpc RejectPrivateVoiceChat(RejectPrivateVoiceChatPayload) returns (RejectPrivateVoiceChatResponse) {}
+
+  // End a private voice chat
+  rpc EndPrivateVoiceChat(EndPrivateVoiceChatPayload) returns (EndPrivateVoiceChatResponse) {}
+
+  // Get the incoming private voice chat request
+  rpc GetIncomingPrivateVoiceChatRequest(google.protobuf.Empty) returns (GetIncomingPrivateVoiceChatRequestResponse) {}
+
+  // Subscribe to private voice chat updates
+  rpc SubscribeToPrivateVoiceChatUpdates(google.protobuf.Empty) returns (stream PrivateVoiceChatUpdate) {}
 }