feat/add one url for fishjam (#82)

* feat: add one url for fishjam

Author: kamciokodzi

.env.example

@@ -6,7 +6,7 @@ JF_SERVER_API_TOKEN="development"
 
 # SSL
 DOMAIN=localhost
-# BE_JF_ADDRESSES=<fishjam_domain_address1> <fishjam_domain_address2>
+# BE_JF_ADDRESS=<fishjam_domain_address>
 # BE_HOST=<backend_domain_address>
 # BE_JF_SECURE_CONNECTION=false
 # JF_CHECK_ORIGIN=false

.github/workflows/production_build_and_deploy.yml

@@ -33,7 +33,7 @@ jobs:
           JF_SERVER_API_TOKEN=${{secrets.SERVER_API_TOKEN_CLOUD_PRODUCTION}}
           BE_HOST=${{env.BE_HOST}}
           BE_JF_SECURE_CONNECTION=true
-          BE_JF_ADDRESSES=${{vars.JF1_HOST_CLOUD_PRODUCTION}}" > .env
+          BE_JF_ADDRESS=${{vars.JF_HOST_CLOUD_PRODUCTION}}" > .env
 
       - name: Remove old containers on first host
         uses: JimCronqvist/action-ssh@master

.github/workflows/sandbox_build_and_deploy.yml

@@ -35,7 +35,7 @@ jobs:
           JF_SERVER_API_TOKEN=${{secrets.SERVER_API_TOKEN_CLOUD_SANDBOX}}
           BE_HOST=${{env.BE_HOST}}
           BE_JF_SECURE_CONNECTION=true
-          BE_JF_ADDRESSES=${{vars.JF_HOST_CLOUD_SANDBOX}}" > .env
+          BE_JF_ADDRESS=${{vars.JF_HOST_CLOUD_SANDBOX}}" > .env
 
       - name: Remove old containers on first host
         uses: JimCronqvist/action-ssh@master

.github/workflows/staging_build_and_deploy.yml

@@ -27,21 +27,21 @@ jobs:
       - name: Prepare .env file for the deployment
         id: variables_population
         run: |
-          echo "DOMAIN=${{env.DOMAIN}} 
+          echo "DOMAIN=${{env.DOMAIN}}
           FISHJAM_ROOM_VERSION=${{ steps.versions.outputs.fishjam_room }}
           FISHJAM_VERSION=${{ steps.versions.outputs.fishjam }}
           JF_SERVER_API_TOKEN=${{secrets.SERVER_API_TOKEN_CLOUD_STAGING}}
           BE_HOST=${{env.BE_HOST}}
           BE_JF_SECURE_CONNECTION=true
-          BE_JF_ADDRESSES=${{vars.JF1_HOST_CLOUD_STAGING}}" > .env
+          BE_JF_ADDRESS=${{vars.JF_HOST_CLOUD_STAGING}}" > .env
 
       - name: Remove old containers on first host
         uses: JimCronqvist/action-ssh@master
         with:
           hosts: ${{ secrets.STAGING_HOST }}
           privateKey: ${{ secrets.SSH_PRIV_KEY }}
           command: |
-            docker ps -aq | xargs -r docker stop | xargs -r docker rm 
+            docker ps -aq | xargs -r docker stop | xargs -r docker rm
 
       - name: Deploy docker compose to a pre-configured server on first host
         uses: TapTap21/docker-remote-deployment-action@v1.1

.gitignore

@@ -35,3 +35,5 @@ videoroom-*.tar
 .env
 
 certbot/
+
+.vscode

README.md

@@ -31,11 +31,11 @@ When running the build version of the Phoenix app, you must specify the addresse
 As well as the authentication token via the environment variables:
 
 ```sh
-BE_JF_ADDRESSES=<IP_ADDRESS1>:<PORT1> OR <DOMAIN1> <IP_ADDRESS2>:<PORT2> OR <DOMAIN2> #Example of using two fishjams: `127.0.0.1:5002 room.fishjam.ovh`, if not provided in dev environment `localhost:5002 localhost:5003` is used.
+BE_JF_ADDRESS=<IP_ADDRESS>:<PORT1> OR <DOMAIN1> #Example `127.0.0.1:5002 OR room.fishjam.ovh`, if not provided in dev environment `localhost:5002` is used.
 BE_JF_SERVER_API_TOKEN=<TOKEN> #This must be the same token that was setup in fishjam. In `docker-compose-dev.yaml` we setup `development` and this variable is used by default in `dev` environment
 ```
 
-Optionally, in production, these variables can be set: 
+Optionally, in production, these variables can be set:
 * `BE_PEER_JOIN_TIMEOUT` - can be used to limit the period in which a new peer must join the meeting,
 * `BE_JF_SECURE_CONNECTION` - enforces connecting the backend to fishjam through `wss` protocol,
 * `BE_HOST` - address of backend
@@ -57,21 +57,17 @@ You can copy the `.env.example` file to `.env` and adjust it to your needs.
 ## Deployment with load-balancing
 
 `docker-compose.yaml` allows to run a fishjam videoroom with multiple fishjams but all of that runs on the same machine.
-For properly using load-balancing two machines will be needed and `docker-compose-deploy.yaml` will be used. 
+For properly using load-balancing two machines will be needed and `docker-compose-deploy.yaml` will be used.
 You can see our deployment workflow  [here](.github/workflows/test_build_and_deploy.yml).
-This deployment is pretty simple. 
+This deployment is pretty simple.
 All containers besides `fishjam2` are started on node1 and `fishjam2` is started on node2.
 All environment variables used in our deployment are presented below:
 
 ```sh
 DOMAIN=<FRONTEND_DOMAIN>
-JF1_IP=<NODE1_IP> # IP address of first node on which fishjam will be run
-JF2_IP=<NODE2_IP> # IP address of second node on which fishjam will be run
 JF_SERVER_API_TOKEN=<API_TOKEN> #The same API token is used for all fishjams
-JF1_HOST=<DOMAIN_FISHJAM1> OR <JF1_IP>:<FISHJAM1_PORT> # Value passed to fishjam and returns by it when creating a room on this speicific fishjam
-JF2_HOST=<DOMAIN_FISHJAM2> OR <JF2_IP>:<FISHJAM2_PORT>
-BE_JF_ADDRESSES=<JF1_HOST> <JF2_HOST> #Used by backend to create a notifier to one of fishjams
-PROMETHEUS_TARGETS=<JF1_IP>:9568,<JF2_IP>:9568 #Addresses on which prometheus will query for data
+BE_JF_ADDRESS=<DOMAIN_FISHJAM1> OR <FISHJAM_IP>:<FISHJAM_PORT>  #Used by backend to create a notifier and to communicate with fishjam
+PROMETHEUS_TARGETS=<FISHJAM_IP>:9568 #Addresses on which prometheus will query for data
 BE_HOST=<BACKEND_DOMAIN>
 GF_SECURITY_ADMIN_PASSWORD=<GRAFANA_PASSWORD>
 GF_SECURITY_ADMIN_USER=<GRAFANA_LOGIN>

config/dev.exs

@@ -43,16 +43,12 @@ config :fishjam_server_sdk,
 # configured to run both http and https servers on
 # different ports.
 
-fishjam_addresses = System.get_env("BE_JF_ADDRESSES", "localhost:5002 localhost:5003")
-
-fishjam_addresses = String.split(fishjam_addresses, " ")
-
 # Enable dev routes for dashboard and mailbox
 config :videoroom,
   dev_routes: true,
   peer_disconnected_timeout: 60,
   peerless_purge_timeout: 120,
-  fishjam_addresses: fishjam_addresses
+  fishjam_address: "localhost:5002"
 
 # Do not include metadata nor timestamps in development logs
 config :logger, :console, format: "[$level] $message\n"

config/integration_test.exs

@@ -5,6 +5,6 @@ config :fishjam_server_sdk,
   server_api_token: "development"
 
 config :videoroom,
-  fishjam_addresses: ["fishjam:5002"],
+  fishjam_address: "fishjam:5002",
   peer_disconnected_timeout: 1,
   peerless_purge_timeout: 3

config/runtime.exs

@@ -1,21 +1,5 @@
 import Config
 
-# config/runtime.exs is executed for all environments, including
-# during releases. It is executed after compilation and before the
-# system starts, so it is typically used to load production configuration
-# and secrets from environment variables or elsewhere. Do not define
-# any compile-time configuration in here, as it won't be applied.
-# The block below contains prod specific runtime configuration.
-
-# ## Using releases
-#
-# If you use `mix release`, you need to explicitly enable the server
-# by passing the BE_PHX_SERVER=true when you start it:
-#
-#     BE_PHX_SERVER=true bin/videoroom start
-#
-# Alternatively, you can use `mix phx.gen.release` to generate a `bin/server`
-# script that automatically sets the env var above.
 if System.get_env("BE_PHX_SERVER") do
   config :videoroom, VideoroomWeb.Endpoint, server: true
 end
@@ -29,11 +13,6 @@ if config_env() == :test do
 end
 
 if config_env() == :prod do
-  # The secret key base is used to sign/encrypt cookies and other secrets.
-  # A default value is used in config/dev.exs and config/test.exs but you
-  # want to use a different value for prod and you most likely don't want
-  # to check this value into version control, so we use an environment
-  # variable instead.
   secret_key_base =
     System.get_env("BE_SECRET_KEY_BASE") || Base.encode64(:crypto.strong_rand_bytes(48))
 
@@ -43,20 +22,11 @@ if config_env() == :prod do
   config :videoroom, VideoroomWeb.Endpoint,
     url: [host: host, port: 443, scheme: "https"],
     http: [
-      # Enable IPv6 and bind on all interfaces.
-      # Set it to  {0, 0, 0, 0, 0, 0, 0, 1} for local network only access.
-      # See the documentation on https://hexdocs.pm/plug_cowboy/Plug.Cowboy.html
-      # for details about using IPv6 vs IPv4 and loopback vs public addresses.
       ip: {0, 0, 0, 0, 0, 0, 0, 0},
       port: port
     ],
     secret_key_base: secret_key_base
 
-  fishjam_addresses =
-    System.get_env("BE_JF_ADDRESSES") || raise "Environment variable BE_JF_ADDRESSES is missing."
-
-  fishjam_addresses = String.split(fishjam_addresses, " ")
-
   secure_connection? = System.get_env("BE_JF_SECURE_CONNECTION", "false") == "true"
 
   config :fishjam_server_sdk,
@@ -68,40 +38,9 @@ if config_env() == :prod do
         """)
 
   config :videoroom,
-    fishjam_addresses: fishjam_addresses,
+    fishjam_address:
+      System.get_env("BE_JF_ADDRESS") || raise("Environment variable BE_JF_ADDRESS is missing."),
     peer_disconnected_timeout:
       String.to_integer(System.get_env("PEER_DISCONNECTED_TIMEOUT") || "120"),
     peerless_purge_timeout: String.to_integer(System.get_env("PEERLESS_PURGE_TIMEOUT") || "60")
-
-  # ## SSL Support
-  #
-  # To get SSL working, you will need to add the `https` key
-  # to your endpoint configuration:
-  #
-  #     config :videoroom, VideoroomWeb.Endpoint,
-  #       https: [
-  #         ...,
-  #         port: 443,
-  #         cipher_suite: :strong,
-  #         keyfile: System.get_env("SOME_APP_SSL_KEY_PATH"),
-  #         certfile: System.get_env("SOME_APP_SSL_CERT_PATH")
-  #       ]
-  #
-  # The `cipher_suite` is set to `:strong` to support only the
-  # latest and more secure SSL ciphers. This means old browsers
-  # and clients may not be supported. You can set it to
-  # `:compatible` for wider support.
-  #
-  # `:keyfile` and `:certfile` expect an absolute path to the key
-  # and cert in disk or a relative path inside priv, for example
-  # "priv/ssl/server.key". For all supported SSL configuration
-  # options, see https://hexdocs.pm/plug/Plug.SSL.html#configure/1
-  #
-  # We also recommend setting `force_ssl` in your endpoint, ensuring
-  # no data is ever sent via http, always redirecting to https:
-  #
-  #     config :videoroom, VideoroomWeb.Endpoint,
-  #       force_ssl: [hsts: true]
-  #
-  # Check `Plug.SSL` for all available options in `force_ssl`.
 end

config/test.exs

@@ -14,7 +14,7 @@ config :fishjam_server_sdk,
 config :videoroom,
   divo: "docker-compose-dev.yaml",
   divo_wait: [dwell: 1500, max_tries: 50],
-  fishjam_addresses: ["localhost:5002"],
+  fishjam_address: "localhost:5002",
   peer_disconnected_timeout: 1,
   peerless_purge_timeout: 3
 

docker-compose-deploy.yaml

@@ -27,7 +27,7 @@ services:
       BE_PHX_SERVER: "true"
       BE_JF_SECURE_CONNECTION: ${BE_JF_SECURE_CONNECTION:-false}
       BE_JF_SERVER_API_TOKEN: ${JF_SERVER_API_TOKEN}
-      BE_JF_ADDRESSES: ${BE_JF_ADDRESSES:-$JF1_IP:$JF_PORT $JF2_IP:$JF_PORT}
+      BE_JF_ADDRESS: ${BE_JF_ADDRESS}
     restart: unless-stopped
     ports:
       - "5004:5004"

docker-compose-integration.yaml

@@ -6,7 +6,7 @@ services:
     command: sh -c "cd app/ && apk add git && mix local.hex --force && mix local.rebar --force && mix deps.get && mix test --warnings-as-errors"
     environment:
       MIX_ENV: integration_test
-      BE_JF_ADDRESSES: fishjam:5002
+      BE_JF_ADDRESS: fishjam:5002
       BE_JF_SECURE_CONNECTION: false
 
     volumes:

docker-compose.yaml

@@ -17,7 +17,7 @@ services:
     container_name: fishjam1
     environment:
       <<: *fishjam-environment
-      JF_HOST: "${JF1_HOST:-${JF1_IP:-$EXTERNAL_IP}:5002}"
+      JF_HOST: "localhost:5002}"
       JF_PORT: 5002
       JF_DIST_NODE_NAME: app@fishjam1
       JF_WEBRTC_TURN_PORT_RANGE: "50000-50100"
@@ -33,7 +33,7 @@ services:
     container_name: fishjam2
     environment:
       <<: *fishjam-environment
-      JF_HOST: "${JF2_HOST:-${JF2_IP:-$EXTERNAL_IP}:5003}"
+      JF_HOST: "localhost:5003}"
       JF_PORT: 5003
       JF_DIST_NODE_NAME: app@fishjam2
       JF_WEBRTC_TURN_PORT_RANGE: "50101-50200"
@@ -69,7 +69,7 @@ services:
       BE_PORT: 5004
       BE_HOST: ${BE_HOST:-$DOMAIN}
       BE_PHX_SERVER: "true"
-      BE_JF_ADDRESSES: ${BE_JF_ADDRESSES:-fishjam1:5002 fishjam2:5003}
+      BE_JF_ADDRESS: ${BE_JF_ADDRESS:-fishjam1:5002}
       BE_JF_SECURE_CONNECTION: ${BE_JF_SECURE_CONNECTION:-false}
       BE_JF_SERVER_API_TOKEN: ${JF_SERVER_API_TOKEN:-development}
     restart: unless-stopped

lib/videoroom/meeting.ex

@@ -18,8 +18,7 @@ defmodule Videoroom.Meeting do
     @enforce_keys [
       :name,
       :client,
-      :room_id,
-      :fishjam_address
+      :room_id
     ]
 
     defstruct @enforce_keys
@@ -98,30 +97,28 @@ defmodule Videoroom.Meeting do
   # Callbacks
 
   @impl true
-  def init(%{name: name, fishjam_address: fishjam_address}) do
+  def init(%{name: name}) do
     Logger.metadata(room_name: name)
+    fishjam_address = Application.fetch_env!(:videoroom, :fishjam_address)
 
     client = Fishjam.Client.new(server_address: fishjam_address)
 
     peer_disconnected_timeout = Application.fetch_env!(:videoroom, :peer_disconnected_timeout)
     peerless_purge_timeout = Application.fetch_env!(:videoroom, :peerless_purge_timeout)
 
-    with {:ok, room, fishjam_address} <-
+    with {:ok, room} <-
            create_new_room(client, name,
              video_codec: :h264,
              peer_disconnected_timeout: peer_disconnected_timeout,
              peerless_purge_timeout: peerless_purge_timeout
            ) do
-      client = Fishjam.Client.update_address(client, fishjam_address)
-
       Logger.info("Created meeting room id: #{room.id}")
 
       {:ok,
        %State{
          client: client,
          name: name,
-         room_id: room.id,
-         fishjam_address: fishjam_address
+         room_id: room.id
        }}
     else
       {:error, reason} ->
@@ -131,10 +128,9 @@ defmodule Videoroom.Meeting do
   end
 
   defp create_new_room(client, name, opts) do
-    with {:ok, room, fishjam_address} <- Room.create(client, opts),
-         client <- Fishjam.Client.update_address(client, fishjam_address),
+    with {:ok, room, _fishjam_address} <- Room.create(client, opts),
          :ok <- add_room_to_registry(client, name, room) do
-      {:ok, room, fishjam_address}
+      {:ok, room}
     end
   end
 
@@ -156,19 +152,15 @@ defmodule Videoroom.Meeting do
       {:ok, %{peer: peer, token: token}} ->
         Logger.info("Added peer #{peer.id}")
 
-        {:reply, {:ok, token, state.fishjam_address}, state}
+        {:reply, {:ok, token}, state}
 
       {:error, ^text} ->
-        Logger.error(
-          "Failed to add peer, because of room #{state.room_id} does not exist on fishjam: #{state.fishjam_address}"
-        )
+        Logger.error("Failed to add peer, because of room #{state.room_id} does not exist")
 
         {:stop, :room_not_exist, {:error, "Failed to add peer"}, state}
 
       error ->
-        Logger.error(
-          "Failed to add peer, because of error: #{inspect(error)} on fishjam: #{state.fishjam_address}"
-        )
+        Logger.error("Failed to add peer, because of error: #{inspect(error)}")
 
         {:reply, {:error, "Failed to add peer"}, state}
     end