Skip to content

Remove stream notifications and add streamer notifications #36

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Karolk99 merged 3 commits into from
Oct 1, 2025
Merged

Remove stream notifications and add streamer notifications #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0d94acb
Remove stream notifications and add streamer notifications
Karolk99 Sep 22, 2025
c5db373
Deprecate stream_connected and stream_disconnected
Karolk99 Oct 1, 2025
af71635
Update docs
Karolk99 Oct 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 38 additions & 2 deletions doc/docs.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,8 @@
- [ServerMessage.RoomDeleted](#fishjam-ServerMessage-RoomDeleted)
- [ServerMessage.StreamConnected](#fishjam-ServerMessage-StreamConnected)
- [ServerMessage.StreamDisconnected](#fishjam-ServerMessage-StreamDisconnected)
- [ServerMessage.StreamerConnected](#fishjam-ServerMessage-StreamerConnected)
- [ServerMessage.StreamerDisconnected](#fishjam-ServerMessage-StreamerDisconnected)
- [ServerMessage.SubscribeRequest](#fishjam-ServerMessage-SubscribeRequest)
- [ServerMessage.SubscribeResponse](#fishjam-ServerMessage-SubscribeResponse)
- [ServerMessage.TrackAdded](#fishjam-ServerMessage-TrackAdded)
Expand Down Expand Up @@ -1247,10 +1249,12 @@ Defines any type of message passed between FJ and server peer
| track_metadata_updated | [ServerMessage.TrackMetadataUpdated](#fishjam-ServerMessage-TrackMetadataUpdated) | | |
| peer_added | [ServerMessage.PeerAdded](#fishjam-ServerMessage-PeerAdded) | | |
| peer_deleted | [ServerMessage.PeerDeleted](#fishjam-ServerMessage-PeerDeleted) | | |
| stream_connected | [ServerMessage.StreamConnected](#fishjam-ServerMessage-StreamConnected) | | |
| stream_disconnected | [ServerMessage.StreamDisconnected](#fishjam-ServerMessage-StreamDisconnected) | | |
| stream_connected | [ServerMessage.StreamConnected](#fishjam-ServerMessage-StreamConnected) | | **Deprecated.** |
| stream_disconnected | [ServerMessage.StreamDisconnected](#fishjam-ServerMessage-StreamDisconnected) | | **Deprecated.** |
| viewer_connected | [ServerMessage.ViewerConnected](#fishjam-ServerMessage-ViewerConnected) | | |
| viewer_disconnected | [ServerMessage.ViewerDisconnected](#fishjam-ServerMessage-ViewerDisconnected) | | |
| streamer_connected | [ServerMessage.StreamerConnected](#fishjam-ServerMessage-StreamerConnected) | | |
| streamer_disconnected | [ServerMessage.StreamerDisconnected](#fishjam-ServerMessage-StreamerDisconnected) | | |



Expand Down Expand Up @@ -1523,6 +1527,38 @@ Notification sent when streamer disconnects



<a name="fishjam-ServerMessage-StreamerConnected"></a>

### ServerMessage.StreamerConnected



| Field | Type | Label | Description |
| ----- | ---- | ----- | ----------- |
| stream_id | [string](#string) | | |
| streamer_id | [string](#string) | | |






<a name="fishjam-ServerMessage-StreamerDisconnected"></a>

### ServerMessage.StreamerDisconnected



| Field | Type | Label | Description |
| ----- | ---- | ----- | ----------- |
| stream_id | [string](#string) | | |
| streamer_id | [string](#string) | | |






<a name="fishjam-ServerMessage-SubscribeRequest"></a>

### ServerMessage.SubscribeRequest
Expand Down
16 changes: 14 additions & 2 deletions fishjam/server_notifications.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,16 @@ message ServerMessage {
string viewer_id = 2;
}

message StreamerConnected {
string stream_id = 1;
string streamer_id = 2;
}

message StreamerDisconnected {
string stream_id = 1;
string streamer_id = 2;
}

reserved 12;

oneof content {
Expand All @@ -193,9 +203,11 @@ message ServerMessage {
TrackMetadataUpdated track_metadata_updated = 19;
PeerAdded peer_added = 20;
PeerDeleted peer_deleted = 21;
StreamConnected stream_connected = 22;
StreamDisconnected stream_disconnected = 23;
StreamConnected stream_connected = 22 [deprecated = true];
StreamDisconnected stream_disconnected = 23 [deprecated = true];
ViewerConnected viewer_connected = 24;
ViewerDisconnected viewer_disconnected = 25;
StreamerConnected streamer_connected = 26;
StreamerDisconnected streamer_disconnected = 27;
}
}
34 changes: 32 additions & 2 deletions fishjam_protos/lib/fishjam/server_notifications.pb.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,6 +240,24 @@ defmodule Fishjam.ServerMessage.ViewerDisconnected do
field :viewer_id, 2, type: :string, json_name: "viewerId"
end

defmodule Fishjam.ServerMessage.StreamerConnected do
@moduledoc false

use Protobuf, protoc_gen_elixir_version: "0.15.0", syntax: :proto3

field :stream_id, 1, type: :string, json_name: "streamId"
field :streamer_id, 2, type: :string, json_name: "streamerId"
end

defmodule Fishjam.ServerMessage.StreamerDisconnected do
@moduledoc false

use Protobuf, protoc_gen_elixir_version: "0.15.0", syntax: :proto3

field :stream_id, 1, type: :string, json_name: "streamId"
field :streamer_id, 2, type: :string, json_name: "streamerId"
end

defmodule Fishjam.ServerMessage do
@moduledoc false

Expand Down Expand Up @@ -344,12 +362,14 @@ defmodule Fishjam.ServerMessage do
field :stream_connected, 22,
type: Fishjam.ServerMessage.StreamConnected,
json_name: "streamConnected",
oneof: 0
oneof: 0,
deprecated: true

field :stream_disconnected, 23,
type: Fishjam.ServerMessage.StreamDisconnected,
json_name: "streamDisconnected",
oneof: 0
oneof: 0,
deprecated: true

field :viewer_connected, 24,
type: Fishjam.ServerMessage.ViewerConnected,
Expand All @@ -360,4 +380,14 @@ defmodule Fishjam.ServerMessage do
type: Fishjam.ServerMessage.ViewerDisconnected,
json_name: "viewerDisconnected",
oneof: 0

field :streamer_connected, 26,
type: Fishjam.ServerMessage.StreamerConnected,
json_name: "streamerConnected",
oneof: 0

field :streamer_disconnected, 27,
type: Fishjam.ServerMessage.StreamerDisconnected,
json_name: "streamerDisconnected",
oneof: 0
end
2 changes: 1 addition & 1 deletion fishjam_protos/mix.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
%{
"earmark_parser": {:hex, :earmark_parser, "1.4.44", "f20830dd6b5c77afe2b063777ddbbff09f9759396500cdbe7523efd58d7a339c", [:mix], [], "hexpm", "4778ac752b4701a5599215f7030989c989ffdc4f6df457c5f36938cc2d2a2750"},
"ex_doc": {:hex, :ex_doc, "0.38.2", "504d25eef296b4dec3b8e33e810bc8b5344d565998cd83914ffe1b8503737c02", [:mix], [{:earmark_parser, "~> 1.4.44", [hex: :earmark_parser, repo: "hexpm", optional: false]}, {:makeup_c, ">= 0.1.0", [hex: :makeup_c, repo: "hexpm", optional: true]}, {:makeup_elixir, "~> 0.14 or ~> 1.0", [hex: :makeup_elixir, repo: "hexpm", optional: false]}, {:makeup_erlang, "~> 0.1 or ~> 1.0", [hex: :makeup_erlang, repo: "hexpm", optional: false]}, {:makeup_html, ">= 0.1.0", [hex: :makeup_html, repo: "hexpm", optional: true]}], "hexpm", "732f2d972e42c116a70802f9898c51b54916e542cc50968ac6980512ec90f42b"},
"ex_doc": {:hex, :ex_doc, "0.38.4", "ab48dff7a8af84226bf23baddcdda329f467255d924380a0cf0cee97bb9a9ede", [:mix], [{:earmark_parser, "~> 1.4.44", [hex: :earmark_parser, repo: "hexpm", optional: false]}, {:makeup_c, ">= 0.1.0", [hex: :makeup_c, repo: "hexpm", optional: true]}, {:makeup_elixir, "~> 0.14 or ~> 1.0", [hex: :makeup_elixir, repo: "hexpm", optional: false]}, {:makeup_erlang, "~> 0.1 or ~> 1.0", [hex: :makeup_erlang, repo: "hexpm", optional: false]}, {:makeup_html, ">= 0.1.0", [hex: :makeup_html, repo: "hexpm", optional: true]}], "hexpm", "f7b62346408a83911c2580154e35613eb314e0278aeea72ed7fedef9c1f165b2"},
"makeup": {:hex, :makeup, "1.2.1", "e90ac1c65589ef354378def3ba19d401e739ee7ee06fb47f94c687016e3713d1", [:mix], [{:nimble_parsec, "~> 1.4", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "d36484867b0bae0fea568d10131197a4c2e47056a6fbe84922bf6ba71c8d17ce"},
"makeup_elixir": {:hex, :makeup_elixir, "1.0.1", "e928a4f984e795e41e3abd27bfc09f51db16ab8ba1aebdba2b3a575437efafc2", [:mix], [{:makeup, "~> 1.0", [hex: :makeup, repo: "hexpm", optional: false]}, {:nimble_parsec, "~> 1.2.3 or ~> 1.3", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "7284900d412a3e5cfd97fdaed4f5ed389b8f2b4cb49efc0eb3bd10e2febf9507"},
"makeup_erlang": {:hex, :makeup_erlang, "1.0.2", "03e1804074b3aa64d5fad7aa64601ed0fb395337b982d9bcf04029d68d51b6a7", [:mix], [{:makeup, "~> 1.0", [hex: :makeup, repo: "hexpm", optional: false]}], "hexpm", "af33ff7ef368d5893e4a267933e7744e46ce3cf1f61e2dccf53a111ed3aa3727"},
Expand Down
Loading