Update deps, prepare for release 0.3.0 (#139)

fishjam-dev · Jan 9, 2024 · fe17b8c · fe17b8c
1 parent 837c21d
commit fe17b8c
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 16 deletions.
diff --git a/mix.exs b/mix.exs
@@ -4,7 +4,7 @@ defmodule Jellyfish.MixProject do
   def project do
     [
       app: :jellyfish,
-      version: "0.2.0",
+      version: "0.3.0",
       elixir: "~> 1.14",
       elixirc_paths: elixirc_paths(Mix.env()),
       start_permanent: Mix.env() == :prod,
@@ -68,14 +68,11 @@ defmodule Jellyfish.MixProject do
       {:protobuf, "~> 0.12.0"},
 
       # Membrane deps
-      {:membrane_rtc_engine,
-       github: "jellyfish-dev/membrane_rtc_engine", sparse: "engine", override: true},
-      {:membrane_rtc_engine_webrtc,
-       github: "jellyfish-dev/membrane_rtc_engine", sparse: "webrtc", override: true},
-      {:membrane_rtc_engine_hls, github: "jellyfish-dev/membrane_rtc_engine", sparse: "hls"},
-      {:membrane_rtc_engine_rtsp, github: "jellyfish-dev/membrane_rtc_engine", sparse: "rtsp"},
-      {:membrane_rtc_engine_file,
-       github: "jellyfish-dev/membrane_rtc_engine", sparse: "file", override: true},
+      {:membrane_rtc_engine, "~> 0.19.0"},
+      {:membrane_rtc_engine_webrtc, "~> 0.5.0"},
+      {:membrane_rtc_engine_hls, "~> 0.4.0"},
+      {:membrane_rtc_engine_rtsp, "~> 0.4.0"},
+      {:membrane_rtc_engine_file, "~> 0.2.0"},
       {:membrane_ice_plugin, "~> 0.17.0"},
       {:membrane_telemetry_metrics, "~> 0.1.0"},
 

diff --git a/mix.lock b/mix.lock
@@ -61,11 +61,11 @@
   "membrane_raw_audio_format": {:hex, :membrane_raw_audio_format, "0.12.0", "b574cd90f69ce2a8b6201b0ccf0826ca28b0fbc8245b8078d9f11cef65f7d5d5", [:mix], [{:bimap, "~> 1.1", [hex: :bimap, repo: "hexpm", optional: false]}, {:bunch, "~> 1.0", [hex: :bunch, repo: "hexpm", optional: false]}, {:membrane_core, "~> 1.0", [hex: :membrane_core, repo: "hexpm", optional: false]}], "hexpm", "6e6c98e3622a2b9df19eab50ba65d7eb45949b1ba306fa8423df6cdb12fd0b44"},
   "membrane_raw_video_format": {:hex, :membrane_raw_video_format, "0.3.0", "ba10f475e0814a6fe79602a74536b796047577c7ef5b0e33def27cd344229699", [:mix], [], "hexpm", "2f08760061c8a5386ecf04273480f10e48d25a1a40aa99476302b0bcd34ccb1c"},
   "membrane_realtimer_plugin": {:hex, :membrane_realtimer_plugin, "0.9.0", "27210d5e32a5e8bfd101c41e4d8c1876e873a52cc129ebfbee4d0ccbea1cbd21", [:mix], [{:membrane_core, "~> 1.0", [hex: :membrane_core, repo: "hexpm", optional: false]}], "hexpm", "b2e96d62135ee57ef9a5fdea94b3a9ab1198e5ea8ee248391b89c671125d1b51"},
-  "membrane_rtc_engine": {:git, "https://github.com/jellyfish-dev/membrane_rtc_engine.git", "765e20927d302f6bbb5587dbaf7142e3e4929cfa", [sparse: "engine"]},
-  "membrane_rtc_engine_file": {:git, "https://github.com/jellyfish-dev/membrane_rtc_engine.git", "765e20927d302f6bbb5587dbaf7142e3e4929cfa", [sparse: "file"]},
-  "membrane_rtc_engine_hls": {:git, "https://github.com/jellyfish-dev/membrane_rtc_engine.git", "d8063fda1c7547415440a34477d3c673c0a1ebf6", [sparse: "hls"]},
-  "membrane_rtc_engine_rtsp": {:git, "https://github.com/jellyfish-dev/membrane_rtc_engine.git", "765e20927d302f6bbb5587dbaf7142e3e4929cfa", [sparse: "rtsp"]},
-  "membrane_rtc_engine_webrtc": {:git, "https://github.com/jellyfish-dev/membrane_rtc_engine.git", "765e20927d302f6bbb5587dbaf7142e3e4929cfa", [sparse: "webrtc"]},
+  "membrane_rtc_engine": {:hex, :membrane_rtc_engine, "0.19.0", "6ca3f1e1e8cd9129ac45790bec619c4b11f4abb1968dbe7f9d2884c9f3f66072", [:mix], [{:elixir_uuid, "~> 1.2", [hex: :elixir_uuid, repo: "hexpm", optional: false]}, {:ex_sdp, "~> 0.13.1", [hex: :ex_sdp, repo: "hexpm", optional: false]}, {:membrane_core, "~> 1.0", [hex: :membrane_core, repo: "hexpm", optional: false]}, {:membrane_opentelemetry, "~> 0.1.0", [hex: :membrane_opentelemetry, repo: "hexpm", optional: false]}, {:membrane_rtp_format, "~> 0.8.0", [hex: :membrane_rtp_format, repo: "hexpm", optional: false]}, {:membrane_rtp_plugin, "~> 0.24.1", [hex: :membrane_rtp_plugin, repo: "hexpm", optional: false]}, {:opentelemetry, "~> 1.0.0", [hex: :opentelemetry, repo: "hexpm", optional: false]}, {:opentelemetry_api, "~> 1.0.0", [hex: :opentelemetry_api, repo: "hexpm", optional: false]}, {:statistics, "~> 0.6.0", [hex: :statistics, repo: "hexpm", optional: false]}], "hexpm", "daa9da426aa1e6468bab65a0ce1c0c06187c5ec90138c8fd125f23ea2e692d85"},
+  "membrane_rtc_engine_file": {:hex, :membrane_rtc_engine_file, "0.2.0", "c330a965df4ea4fa8185526b50f2b2ed4825a80780d64ae2cfb61f3af3ee7bca", [:mix], [{:membrane_core, "~> 1.0", [hex: :membrane_core, repo: "hexpm", optional: false]}, {:membrane_file_plugin, "~> 0.16.0", [hex: :membrane_file_plugin, repo: "hexpm", optional: false]}, {:membrane_h264_plugin, "~> 0.9.0", [hex: :membrane_h264_plugin, repo: "hexpm", optional: false]}, {:membrane_ogg_plugin, "~> 0.3.0", [hex: :membrane_ogg_plugin, repo: "hexpm", optional: false]}, {:membrane_opus_plugin, "~> 0.19.0", [hex: :membrane_opus_plugin, repo: "hexpm", optional: false]}, {:membrane_realtimer_plugin, "~> 0.9.0", [hex: :membrane_realtimer_plugin, repo: "hexpm", optional: false]}, {:membrane_rtc_engine, "~> 0.19.0", [hex: :membrane_rtc_engine, repo: "hexpm", optional: false]}, {:membrane_rtc_engine_webrtc, "~> 0.5.0", [hex: :membrane_rtc_engine_webrtc, repo: "hexpm", optional: false]}], "hexpm", "82263a434af6c181e7045b8c7b74946947b6c29fe738f6a37398093b19fc7344"},
+  "membrane_rtc_engine_hls": {:hex, :membrane_rtc_engine_hls, "0.4.0", "7a73fb67a5d3000ab5fdacf4b2d48a604f6ee57de7aaf823d3a756d0f2a4bce3", [:mix], [{:membrane_aac_fdk_plugin, "~> 0.18.1", [hex: :membrane_aac_fdk_plugin, repo: "hexpm", optional: false]}, {:membrane_aac_plugin, "~> 0.18.0", [hex: :membrane_aac_plugin, repo: "hexpm", optional: false]}, {:membrane_audio_mix_plugin, "~> 0.16.0", [hex: :membrane_audio_mix_plugin, repo: "hexpm", optional: true]}, {:membrane_core, "~> 1.0", [hex: :membrane_core, repo: "hexpm", optional: false]}, {:membrane_h264_ffmpeg_plugin, "~> 0.31.0", [hex: :membrane_h264_ffmpeg_plugin, repo: "hexpm", optional: false]}, {:membrane_h264_plugin, "~> 0.9.0", [hex: :membrane_h264_plugin, repo: "hexpm", optional: false]}, {:membrane_http_adaptive_stream_plugin, "~> 0.18.0", [hex: :membrane_http_adaptive_stream_plugin, repo: "hexpm", optional: false]}, {:membrane_opus_plugin, "~> 0.19.0", [hex: :membrane_opus_plugin, repo: "hexpm", optional: false]}, {:membrane_raw_audio_format, "~> 0.12.0", [hex: :membrane_raw_audio_format, repo: "hexpm", optional: false]}, {:membrane_raw_video_format, "~> 0.3.0", [hex: :membrane_raw_video_format, repo: "hexpm", optional: false]}, {:membrane_rtc_engine, "~> 0.19.0", [hex: :membrane_rtc_engine, repo: "hexpm", optional: false]}, {:membrane_rtc_engine_webrtc, "~> 0.5.0", [hex: :membrane_rtc_engine_webrtc, repo: "hexpm", optional: false]}, {:membrane_video_compositor_plugin, "~> 0.7.0", [hex: :membrane_video_compositor_plugin, repo: "hexpm", optional: true]}], "hexpm", "e4cf04b42c255e627f59ce73482deda0bb56a81ddfd32fbc50d0a215ccf42a0a"},
+  "membrane_rtc_engine_rtsp": {:hex, :membrane_rtc_engine_rtsp, "0.4.0", "a4ed1d3aca0b8795c745d2e787e60caaa820f985fdf7ee74b144fdef4e273d4a", [:mix], [{:connection, "~> 1.1", [hex: :connection, repo: "hexpm", optional: false]}, {:ex_sdp, "~> 0.13.1", [hex: :ex_sdp, repo: "hexpm", optional: false]}, {:membrane_core, "~> 1.0", [hex: :membrane_core, repo: "hexpm", optional: false]}, {:membrane_h264_plugin, "~> 0.9.0", [hex: :membrane_h264_plugin, repo: "hexpm", optional: false]}, {:membrane_rtc_engine, "~> 0.19.0", [hex: :membrane_rtc_engine, repo: "hexpm", optional: false]}, {:membrane_rtc_engine_webrtc, "~> 0.5.0", [hex: :membrane_rtc_engine_webrtc, repo: "hexpm", optional: false]}, {:membrane_rtp_format, "~> 0.8.0", [hex: :membrane_rtp_format, repo: "hexpm", optional: false]}, {:membrane_rtp_h264_plugin, "~> 0.19.0", [hex: :membrane_rtp_h264_plugin, repo: "hexpm", optional: false]}, {:membrane_rtp_plugin, "~> 0.24.1", [hex: :membrane_rtp_plugin, repo: "hexpm", optional: false]}, {:membrane_rtsp, "~> 0.5.1", [hex: :membrane_rtsp, repo: "hexpm", optional: false]}, {:membrane_udp_plugin, "~> 0.12.0", [hex: :membrane_udp_plugin, repo: "hexpm", optional: false]}], "hexpm", "5a74afeeeae126a704a6ae1299f7cdab79f72573ab229c66a7a1050c4e3aaf56"},
+  "membrane_rtc_engine_webrtc": {:hex, :membrane_rtc_engine_webrtc, "0.5.0", "10a939c9d666daaa115ddc1112e0b4cc3380326b9aebd81ac3476273d6f12810", [:mix], [{:ex_sdp, "~> 0.13.1", [hex: :ex_sdp, repo: "hexpm", optional: false]}, {:jason, "~> 1.2", [hex: :jason, repo: "hexpm", optional: false]}, {:membrane_core, "~> 1.0", [hex: :membrane_core, repo: "hexpm", optional: false]}, {:membrane_file_plugin, "~> 0.16.0", [hex: :membrane_file_plugin, repo: "hexpm", optional: false]}, {:membrane_ice_plugin, "~> 0.17.0", [hex: :membrane_ice_plugin, repo: "hexpm", optional: false]}, {:membrane_opentelemetry, "~> 0.1.0", [hex: :membrane_opentelemetry, repo: "hexpm", optional: false]}, {:membrane_rtc_engine, "~> 0.19.0", [hex: :membrane_rtc_engine, repo: "hexpm", optional: false]}, {:membrane_rtp_format, "~> 0.8.0", [hex: :membrane_rtp_format, repo: "hexpm", optional: false]}, {:membrane_rtp_h264_plugin, "~> 0.19.0", [hex: :membrane_rtp_h264_plugin, repo: "hexpm", optional: false]}, {:membrane_rtp_plugin, "~> 0.24.1", [hex: :membrane_rtp_plugin, repo: "hexpm", optional: false]}, {:membrane_rtp_vp8_plugin, "~> 0.9.0", [hex: :membrane_rtp_vp8_plugin, repo: "hexpm", optional: false]}, {:membrane_telemetry_metrics, "~> 0.1.0", [hex: :membrane_telemetry_metrics, repo: "hexpm", optional: false]}, {:membrane_webrtc_plugin, "~> 0.17.0", [hex: :membrane_webrtc_plugin, repo: "hexpm", optional: false]}, {:opentelemetry_api, "~> 1.0.0", [hex: :opentelemetry_api, repo: "hexpm", optional: false]}, {:qex, "~> 0.5", [hex: :qex, repo: "hexpm", optional: false]}], "hexpm", "11d59b4a45f90a418f72856cb2cd09b618c18b4519b6a561cdba830547da62ad"},
   "membrane_rtp_format": {:hex, :membrane_rtp_format, "0.8.0", "828924bbd27efcf85b2015ae781e824c4a9928f0a7dc132abc66817b2c6edfc4", [:mix], [{:membrane_core, "~> 1.0", [hex: :membrane_core, repo: "hexpm", optional: false]}], "hexpm", "bc75d2a649dfaef6df563212fbb9f9f62eebc871393692f9dae8d289bd4f94bb"},
   "membrane_rtp_h264_plugin": {:hex, :membrane_rtp_h264_plugin, "0.19.0", "112bfedc14fb83bdb549ef1a03da23908feedeb165fd3e4512a549f1af532ae7", [:mix], [{:bunch, "~> 1.5", [hex: :bunch, repo: "hexpm", optional: false]}, {:membrane_core, "~> 1.0", [hex: :membrane_core, repo: "hexpm", optional: false]}, {:membrane_h264_format, "~> 0.6.0", [hex: :membrane_h264_format, repo: "hexpm", optional: false]}, {:membrane_rtp_format, "~> 0.8.0", [hex: :membrane_rtp_format, repo: "hexpm", optional: false]}], "hexpm", "76fd159e7406cadbef15124cba30eca3fffcf71a7420964f26e23d4cffd9b29d"},
   "membrane_rtp_opus_plugin": {:hex, :membrane_rtp_opus_plugin, "0.9.0", "ae76421faa04697a4af76a55b6c5e675dea61b611d29d8201098783d42863af7", [:mix], [{:membrane_core, "~> 1.0", [hex: :membrane_core, repo: "hexpm", optional: false]}, {:membrane_opus_format, "~> 0.3.0", [hex: :membrane_opus_format, repo: "hexpm", optional: false]}, {:membrane_rtp_format, "~> 0.8.0", [hex: :membrane_rtp_format, repo: "hexpm", optional: false]}], "hexpm", "58f095d2978daf999d87c1c016007cb7d99434208486331ab5045e77f5be9dcc"},

diff --git a/test/jellyfish_web/integration/peer_socket_test.exs b/test/jellyfish_web/integration/peer_socket_test.exs
@@ -137,11 +137,12 @@ defmodule JellyfishWeb.Integration.PeerSocketTest do
   test "media event", %{token: token} do
     ws = create_and_authenticate(token)
 
-    data = Jason.encode!(%{"type" => "custom", "data" => %{"type" => "renegotiateTracks"}})
+    data = Jason.encode!(%{"type" => "connect", "data" => %{"metadata" => nil}})
     msg = PeerMessage.encode(%PeerMessage{content: {:media_event, %MediaEvent{data: data}}})
     :ok = WS.send_binary_frame(ws, msg)
 
-    assert_receive %MediaEvent{data: _data}, 1000
+    assert_receive %MediaEvent{data: data}, 1000
+    assert %{"type" => "connected"} = Jason.decode!(data)
   end
 
   test "peer removal", %{room_id: room_id, peer_id: peer_id, token: token, conn: conn} do