Skip to content

Commit

Permalink
Merge branch 'main' into feat/poc-notifications
Browse files Browse the repository at this point in the history
  • Loading branch information
agusaldasoro committed Sep 26, 2023
2 parents c0e2b7f + a9a962a commit a0dc57c
Show file tree
Hide file tree
Showing 21 changed files with 296 additions and 243 deletions.
12 changes: 12 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -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: "
12 changes: 1 addition & 11 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"protocVersion": "22.2"
},
"dependencies": {
"@dcl/ts-proto": "1.153.0"
"@dcl/ts-proto": "1.154.0"
},
"files": [
"proto",
Expand Down
39 changes: 0 additions & 39 deletions proto/decentraland/bff/authentication_service.proto

This file was deleted.

33 changes: 0 additions & 33 deletions proto/decentraland/bff/comms_director_service.proto

This file was deleted.

25 changes: 0 additions & 25 deletions proto/decentraland/bff/comms_service.proto

This file was deleted.

81 changes: 0 additions & 81 deletions proto/decentraland/bff/http_endpoints.proto

This file was deleted.

34 changes: 0 additions & 34 deletions proto/decentraland/bff/topics_service.proto

This file was deleted.

25 changes: 25 additions & 0 deletions proto/decentraland/kernel/apis/comms_api.proto
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
syntax = "proto3";
package decentraland.kernel.apis;

enum VideoTrackSourceType {
VTST_UNKNOWN = 0;
VTST_CAMERA = 1;
VTST_SCREEN_SHARE = 2;
}

message VideoTracksActiveStreamsRequest {
}

message VideoTracksActiveStreamsResponse {
repeated VideoTracksActiveStreamsData streams = 1;
}

message VideoTracksActiveStreamsData {
string identity = 1;
string track_sid = 2;
VideoTrackSourceType source_type = 3;
}

service CommsApiService {
rpc GetActiveVideoStreams(VideoTracksActiveStreamsRequest) returns (VideoTracksActiveStreamsResponse) {}
}
7 changes: 7 additions & 0 deletions proto/decentraland/kernel/apis/engine_api.proto
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand All @@ -108,4 +113,6 @@ service EngineApiService {

// @deprecated, this response was merged into CrdtSendToResponse
rpc CrdtGetMessageFromRenderer(CrdtMessageFromRendererRequest) returns (CrdtMessageFromRendererResponse) {}

rpc IsServer(IsServerRequest) returns (IsServerResponse) {}
}
1 change: 1 addition & 0 deletions proto/decentraland/kernel/apis/permissions.proto
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Loading

0 comments on commit a0dc57c

Please sign in to comment.