@dcl/protocol 1.0.0-29276634715.commit-82dbfb0 → 1.0.0-29286492043.commit-0010e70

package/out-ts/decentraland/kernel/comms/rfc4/comms.gen.ts

@@ -137,36 +137,6 @@ export interface PlayerEmote {
   incrementalId: number;
   urn: string;
   timestamp: number;
-  /** true means the emote has been stopped in the sender's client */
-  isStopping?:
-    | boolean
-    | undefined;
-  /** true when it is not the first time the looping animation plays */
-  isRepeating?:
-    | boolean
-    | undefined;
-  /** identifies an interaction univocaly, established when the start animation is triggered */
-  interactionId?:
-    | number
-    | undefined;
-  /** -1 means it does not use an outcome animation */
-  socialEmoteOutcome?:
-    | number
-    | undefined;
-  /** to a social emote started by other user */
-  isReacting?:
-    | boolean
-    | undefined;
-  /** wallet address of the user that initiated social emote */
-  socialEmoteInitiator?:
-    | string
-    | undefined;
-  /** wallet address of the user whose avatar is the target of a directed emote */
-  targetAvatar?:
-    | string
-    | undefined;
-  /** mask for which bones an animation applies to. */
-  mask?: number | undefined;
 }
 
 export interface SceneEmote {
@@ -191,11 +161,6 @@ export interface ProfileResponse {
 export interface Chat {
   message: string;
   timestamp: number;
-  /**
-   * Extension: optional forwarded_from to identify the original sender when
-   * messages are forwarded through an SFU
-   */
-  forwardedFrom?: string | undefined;
 }
 
 export interface Scene {
@@ -1322,19 +1287,7 @@ export namespace MovementCompressed {
 }
 
 function createBasePlayerEmote(): PlayerEmote {
-  return {
-    incrementalId: 0,
-    urn: "",
-    timestamp: 0,
-    isStopping: undefined,
-    isRepeating: undefined,
-    interactionId: undefined,
-    socialEmoteOutcome: undefined,
-    isReacting: undefined,
-    socialEmoteInitiator: undefined,
-    targetAvatar: undefined,
-    mask: undefined,
-  };
+  return { incrementalId: 0, urn: "", timestamp: 0 };
 }
 
 export namespace PlayerEmote {
@@ -1348,30 +1301,6 @@ export namespace PlayerEmote {
     if (message.timestamp !== 0) {
       writer.uint32(29).float(message.timestamp);
     }
-    if (message.isStopping !== undefined) {
-      writer.uint32(32).bool(message.isStopping);
-    }
-    if (message.isRepeating !== undefined) {
-      writer.uint32(40).bool(message.isRepeating);
-    }
-    if (message.interactionId !== undefined) {
-      writer.uint32(48).int32(message.interactionId);
-    }
-    if (message.socialEmoteOutcome !== undefined) {
-      writer.uint32(56).int32(message.socialEmoteOutcome);
-    }
-    if (message.isReacting !== undefined) {
-      writer.uint32(64).bool(message.isReacting);
-    }
-    if (message.socialEmoteInitiator !== undefined) {
-      writer.uint32(74).string(message.socialEmoteInitiator);
-    }
-    if (message.targetAvatar !== undefined) {
-      writer.uint32(82).string(message.targetAvatar);
-    }
-    if (message.mask !== undefined) {
-      writer.uint32(88).uint32(message.mask);
-    }
     return writer;
   }
 
@@ -1403,62 +1332,6 @@ export namespace PlayerEmote {
 
           message.timestamp = reader.float();
           continue;
-        case 4:
-          if (tag !== 32) {
-            break;
-          }
-
-          message.isStopping = reader.bool();
-          continue;
-        case 5:
-          if (tag !== 40) {
-            break;
-          }
-
-          message.isRepeating = reader.bool();
-          continue;
-        case 6:
-          if (tag !== 48) {
-            break;
-          }
-
-          message.interactionId = reader.int32();
-          continue;
-        case 7:
-          if (tag !== 56) {
-            break;
-          }
-
-          message.socialEmoteOutcome = reader.int32();
-          continue;
-        case 8:
-          if (tag !== 64) {
-            break;
-          }
-
-          message.isReacting = reader.bool();
-          continue;
-        case 9:
-          if (tag !== 74) {
-            break;
-          }
-
-          message.socialEmoteInitiator = reader.string();
-          continue;
-        case 10:
-          if (tag !== 82) {
-            break;
-          }
-
-          message.targetAvatar = reader.string();
-          continue;
-        case 11:
-          if (tag !== 88) {
-            break;
-          }
-
-          message.mask = reader.uint32();
-          continue;
       }
       if ((tag & 7) === 4 || tag === 0) {
         break;
@@ -1473,14 +1346,6 @@ export namespace PlayerEmote {
       incrementalId: isSet(object.incrementalId) ? Number(object.incrementalId) : 0,
       urn: isSet(object.urn) ? String(object.urn) : "",
       timestamp: isSet(object.timestamp) ? Number(object.timestamp) : 0,
-      isStopping: isSet(object.isStopping) ? Boolean(object.isStopping) : undefined,
-      isRepeating: isSet(object.isRepeating) ? Boolean(object.isRepeating) : undefined,
-      interactionId: isSet(object.interactionId) ? Number(object.interactionId) : undefined,
-      socialEmoteOutcome: isSet(object.socialEmoteOutcome) ? Number(object.socialEmoteOutcome) : undefined,
-      isReacting: isSet(object.isReacting) ? Boolean(object.isReacting) : undefined,
-      socialEmoteInitiator: isSet(object.socialEmoteInitiator) ? String(object.socialEmoteInitiator) : undefined,
-      targetAvatar: isSet(object.targetAvatar) ? String(object.targetAvatar) : undefined,
-      mask: isSet(object.mask) ? Number(object.mask) : undefined,
     };
   }
 
@@ -1489,14 +1354,6 @@ export namespace PlayerEmote {
     message.incrementalId !== undefined && (obj.incrementalId = Math.round(message.incrementalId));
     message.urn !== undefined && (obj.urn = message.urn);
     message.timestamp !== undefined && (obj.timestamp = message.timestamp);
-    message.isStopping !== undefined && (obj.isStopping = message.isStopping);
-    message.isRepeating !== undefined && (obj.isRepeating = message.isRepeating);
-    message.interactionId !== undefined && (obj.interactionId = Math.round(message.interactionId));
-    message.socialEmoteOutcome !== undefined && (obj.socialEmoteOutcome = Math.round(message.socialEmoteOutcome));
-    message.isReacting !== undefined && (obj.isReacting = message.isReacting);
-    message.socialEmoteInitiator !== undefined && (obj.socialEmoteInitiator = message.socialEmoteInitiator);
-    message.targetAvatar !== undefined && (obj.targetAvatar = message.targetAvatar);
-    message.mask !== undefined && (obj.mask = Math.round(message.mask));
     return obj;
   }
 
@@ -1509,14 +1366,6 @@ export namespace PlayerEmote {
     message.incrementalId = object.incrementalId ?? 0;
     message.urn = object.urn ?? "";
     message.timestamp = object.timestamp ?? 0;
-    message.isStopping = object.isStopping ?? undefined;
-    message.isRepeating = object.isRepeating ?? undefined;
-    message.interactionId = object.interactionId ?? undefined;
-    message.socialEmoteOutcome = object.socialEmoteOutcome ?? undefined;
-    message.isReacting = object.isReacting ?? undefined;
-    message.socialEmoteInitiator = object.socialEmoteInitiator ?? undefined;
-    message.targetAvatar = object.targetAvatar ?? undefined;
-    message.mask = object.mask ?? undefined;
     return message;
   }
 }
@@ -1793,7 +1642,7 @@ export namespace ProfileResponse {
 }
 
 function createBaseChat(): Chat {
-  return { message: "", timestamp: 0, forwardedFrom: undefined };
+  return { message: "", timestamp: 0 };
 }
 
 export namespace Chat {
@@ -1804,9 +1653,6 @@ export namespace Chat {
     if (message.timestamp !== 0) {
       writer.uint32(17).double(message.timestamp);
     }
-    if (message.forwardedFrom !== undefined) {
-      writer.uint32(26).string(message.forwardedFrom);
-    }
     return writer;
   }
 
@@ -1831,13 +1677,6 @@ export namespace Chat {
 
           message.timestamp = reader.double();
           continue;
-        case 3:
-          if (tag !== 26) {
-            break;
-          }
-
-          message.forwardedFrom = reader.string();
-          continue;
       }
       if ((tag & 7) === 4 || tag === 0) {
         break;
@@ -1851,7 +1690,6 @@ export namespace Chat {
     return {
       message: isSet(object.message) ? String(object.message) : "",
       timestamp: isSet(object.timestamp) ? Number(object.timestamp) : 0,
-      forwardedFrom: isSet(object.forwardedFrom) ? String(object.forwardedFrom) : undefined,
     };
   }
 
@@ -1859,7 +1697,6 @@ export namespace Chat {
     const obj: any = {};
     message.message !== undefined && (obj.message = message.message);
     message.timestamp !== undefined && (obj.timestamp = message.timestamp);
-    message.forwardedFrom !== undefined && (obj.forwardedFrom = message.forwardedFrom);
     return obj;
   }
 
@@ -1871,7 +1708,6 @@ export namespace Chat {
     const message = createBaseChat();
     message.message = object.message ?? "";
     message.timestamp = object.timestamp ?? 0;
-    message.forwardedFrom = object.forwardedFrom ?? undefined;
     return message;
   }
 }

package/out-ts/decentraland/sdk/components/avatar_shape.gen.ts

@@ -5,40 +5,6 @@ import { Color3 } from "../../common/colors.gen";
 
 export const protobufPackage = "decentraland.sdk.components";
 
-/** Mask for which bones an animation applies to. */
-export enum AvatarEmoteMask {
-  AEM_FULL_BODY = 0,
-  AEM_UPPER_BODY = 1,
-  UNRECOGNIZED = -1,
-}
-
-export function avatarEmoteMaskFromJSON(object: any): AvatarEmoteMask {
-  switch (object) {
-    case 0:
-    case "AEM_FULL_BODY":
-      return AvatarEmoteMask.AEM_FULL_BODY;
-    case 1:
-    case "AEM_UPPER_BODY":
-      return AvatarEmoteMask.AEM_UPPER_BODY;
-    case -1:
-    case "UNRECOGNIZED":
-    default:
-      return AvatarEmoteMask.UNRECOGNIZED;
-  }
-}
-
-export function avatarEmoteMaskToJSON(object: AvatarEmoteMask): string {
-  switch (object) {
-    case AvatarEmoteMask.AEM_FULL_BODY:
-      return "AEM_FULL_BODY";
-    case AvatarEmoteMask.AEM_UPPER_BODY:
-      return "AEM_UPPER_BODY";
-    case AvatarEmoteMask.UNRECOGNIZED:
-    default:
-      return "UNRECOGNIZED";
-  }
-}
-
 /**
  * The AvatarShape component contains the information required to draw and animate avatar, acting as
  * a simplified GLTF container for this specific case.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcl/protocol",
-  "version": "1.0.0-29276634715.commit-82dbfb0",
+  "version": "1.0.0-29286492043.commit-0010e70",
   "description": "",
   "repository": {
     "type": "git",
@@ -13,11 +13,10 @@
   "license": "Apache-2.0",
   "main": "index.js",
   "scripts": {
-    "test": "./scripts/check-proto-compabitility.sh",
-    "gen:test": "node protoc-gen-bitwise/test/generator.test.js"
+    "test": "./scripts/check-proto-compabitility.sh"
   },
   "devDependencies": {
-    "@protobuf-ts/protoc": "^2.11.0",
+    "@protobuf-ts/protoc": "^2.8.1",
     "proto-compatibility-tool": "^1.1.2-20220925163655.commit-25bd040",
     "typescript": "^5.0.4"
   },
@@ -29,12 +28,10 @@
     "protobufjs": "7.2.4"
   },
   "files": [
-    "proto/decentraland",
+    "proto",
     "out-ts",
     "out-js",
-    "public",
-    "protoc-gen-bitwise/*.js",
-    "protoc-gen-bitwise/runtime"
+    "public"
   ],
-  "commit": "82dbfb0b60293a573a9bdbed4a4c002ac6063639"
+  "commit": "0010e703bec8702bbe2d5e5282c619220c2c1ca6"
 }

package/proto/buf.yaml

@@ -0,0 +1,47 @@
+version: v1
+breaking:
+  use:
+    - WIRE_JSON
+  ignore:
+    - google
+lint:
+  use:
+    - DIRECTORY_SAME_PACKAGE
+    - PACKAGE_DEFINED
+    - PACKAGE_DIRECTORY_MATCH
+    - PACKAGE_SAME_DIRECTORY
+    - ENUM_PASCAL_CASE
+    - ENUM_VALUE_UPPER_SNAKE_CASE
+    - FIELD_LOWER_SNAKE_CASE
+    - MESSAGE_PASCAL_CASE
+    - ONEOF_LOWER_SNAKE_CASE
+    - PACKAGE_LOWER_SNAKE_CASE
+    - RPC_PASCAL_CASE
+    - SERVICE_PASCAL_CASE
+    - PACKAGE_SAME_CSHARP_NAMESPACE
+    - PACKAGE_SAME_GO_PACKAGE
+    - PACKAGE_SAME_JAVA_MULTIPLE_FILES
+    - PACKAGE_SAME_JAVA_PACKAGE
+    - PACKAGE_SAME_PHP_NAMESPACE
+    - PACKAGE_SAME_RUBY_PACKAGE
+    - PACKAGE_SAME_SWIFT_PREFIX
+    - ENUM_FIRST_VALUE_ZERO
+    - ENUM_NO_ALLOW_ALIAS
+    - IMPORT_NO_WEAK
+    - IMPORT_NO_PUBLIC
+    - IMPORT_USED
+    - FILE_LOWER_SNAKE_CASE
+    # Ignored:the default value is used
+    # - ENUM_ZERO_VALUE_SUFFIX
+    # Ignored: if a prefix is needed in the target language, implement a preprocessor
+    # - ENUM_VALUE_PREFIX
+    # Not wished
+    # - PACKAGE_VERSION_SUFFIX
+    # TODO: See if this needs to be added
+    # - RPC_REQUEST_RESPONSE_UNIQUE
+    # - RPC_REQUEST_STANDARD_NAME
+    # - RPC_RESPONSE_STANDARD_NAME
+    # - SERVICE_SUFFIX
+  ignore:
+    - google
+    - decentraland/renderer/engine_interface.proto

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

@@ -94,14 +94,6 @@ message PlayerEmote {
   uint32 incremental_id = 1;
   string urn = 2;
   float timestamp = 3;
-  optional bool is_stopping = 4; // true means the emote has been stopped in the sender's client
-  optional bool is_repeating = 5; // true when it is not the first time the looping animation plays
-  optional int32 interaction_id = 6; // identifies an interaction univocaly, established when the start animation is triggered
-  optional int32 social_emote_outcome = 7; // -1 means it does not use an outcome animation
-  optional bool is_reacting = 8; // to a social emote started by other user
-  optional string social_emote_initiator = 9; // wallet address of the user that initiated social emote
-  optional string target_avatar = 10; // wallet address of the user whose avatar is the target of a directed emote
-  optional uint32 mask = 11; // mask for which bones an animation applies to.
 }
 
 message SceneEmote {
@@ -134,9 +126,6 @@ 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/avatar_shape.proto

@@ -42,8 +42,3 @@ message PBAvatarShape {
   optional bool show_only_wearables = 12; // hides the skin + hair + facial features (default: false)
 }
 
-// Mask for which bones an animation applies to.
-enum AvatarEmoteMask {
-  AEM_FULL_BODY = 0;
-  AEM_UPPER_BODY = 1;
-}

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

@@ -25,4 +25,4 @@ message PBLightSource {
     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,9 +10,7 @@ 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/google/LICENSE

@@ -0,0 +1,27 @@
+Copyright 2014, Google Inc.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+    * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+    * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

package/proto/google/README.md

@@ -0,0 +1 @@
+This folder contains stripped and pre-parsed definitions of common Google types. These files are not used by protobuf.js directly but are here so you can use or include them where required.

package/proto/google/api/annotations.json

@@ -0,0 +1,83 @@
+{
+  "nested": {
+    "google": {
+      "nested": {
+        "api": {
+          "nested": {
+            "http": {
+              "type": "HttpRule",
+              "id": 72295728,
+              "extend": "google.protobuf.MethodOptions"
+            },
+            "HttpRule": {
+              "oneofs": {
+                "pattern": {
+                  "oneof": [
+                    "get",
+                    "put",
+                    "post",
+                    "delete",
+                    "patch",
+                    "custom"
+                  ]
+                }
+              },
+              "fields": {
+                "get": {
+                  "type": "string",
+                  "id": 2
+                },
+                "put": {
+                  "type": "string",
+                  "id": 3
+                },
+                "post": {
+                  "type": "string",
+                  "id": 4
+                },
+                "delete": {
+                  "type": "string",
+                  "id": 5
+                },
+                "patch": {
+                  "type": "string",
+                  "id": 6
+                },
+                "custom": {
+                  "type": "CustomHttpPattern",
+                  "id": 8
+                },
+                "selector": {
+                  "type": "string",
+                  "id": 1
+                },
+                "body": {
+                  "type": "string",
+                  "id": 7
+                },
+                "additionalBindings": {
+                  "rule": "repeated",
+                  "type": "HttpRule",
+                  "id": 11
+                }
+              }
+            }
+          }
+        },
+        "protobuf": {
+          "nested": {
+            "MethodOptions": {
+              "fields": {},
+              "extensions": [
+                [
+                  1000,
+                  536870911
+                ]
+              ]
+            }
+          }
+        }
+      }
+    }
+  }
+}

package/proto/google/api/annotations.proto

@@ -0,0 +1,11 @@
+syntax = "proto3";
+
+package google.api;
+
+import "google/api/http.proto";
+import "google/protobuf/descriptor.proto";
+
+extend google.protobuf.MethodOptions {
+
+    HttpRule http = 72295728;
+}

package/proto/google/api/http.json

@@ -0,0 +1,86 @@
+{
+  "nested": {
+    "google": {
+      "nested": {
+        "api": {
+          "nested": {
+            "Http": {
+              "fields": {
+                "rules": {
+                  "rule": "repeated",
+                  "type": "HttpRule",
+                  "id": 1
+                }
+              }
+            },
+            "HttpRule": {
+              "oneofs": {
+                "pattern": {
+                  "oneof": [
+                    "get",
+                    "put",
+                    "post",
+                    "delete",
+                    "patch",
+                    "custom"
+                  ]
+                }
+              },
+              "fields": {
+                "get": {
+                  "type": "string",
+                  "id": 2
+                },
+                "put": {
+                  "type": "string",
+                  "id": 3
+                },
+                "post": {
+                  "type": "string",
+                  "id": 4
+                },
+                "delete": {
+                  "type": "string",
+                  "id": 5
+                },
+                "patch": {
+                  "type": "string",
+                  "id": 6
+                },
+                "custom": {
+                  "type": "CustomHttpPattern",
+                  "id": 8
+                },
+                "selector": {
+                  "type": "string",
+                  "id": 1
+                },
+                "body": {
+                  "type": "string",
+                  "id": 7
+                },
+                "additionalBindings": {
+                  "rule": "repeated",
+                  "type": "HttpRule",
+                  "id": 11
+                }
+              }
+            },
+            "CustomHttpPattern": {
+              "fields": {
+                "kind": {
+                  "type": "string",
+                  "id": 1
+                },
+                "path": {
+                  "type": "string",
+                  "id": 2
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}

package/proto/google/api/http.proto

@@ -0,0 +1,31 @@
+syntax = "proto3";
+
+package google.api;
+
+message Http {
+
+    repeated HttpRule rules = 1;
+}
+
+message HttpRule {
+
+    oneof pattern {
+
+        string get = 2;
+        string put = 3;
+        string post = 4;
+        string delete = 5;
+        string patch = 6;
+        CustomHttpPattern custom = 8;
+    }
+
+    string selector = 1;
+    string body = 7;
+    repeated HttpRule additional_bindings = 11;
+}
+
+message CustomHttpPattern {
+
+    string kind = 1;
+    string path = 2;
+}