Rebranding (#40)

Author: roznawsk

.gitmodules

@@ -1,3 +1,3 @@
 [submodule "protos"]
 	path = protos
-	url = https://github.com/jellyfish-dev/protos.git
+	url = https://github.com/fishjam-dev/protos.git

README.md

@@ -9,12 +9,12 @@ git submodule sync --recursive >> /dev/null
 git submodule update --recursive --remote --init >> /dev/null
 printf "DONE\n\n"
 
-server_file="./protos/jellyfish/server_notifications.proto"
+server_file="./protos/fishjam/server_notifications.proto"
 printf "Compiling: file $server_file\n"
-protoc -I . --python_betterproto_out=./jellyfish/events/_protos $server_file
+protoc -I . --python_betterproto_out=./fishjam/events/_protos $server_file
 printf "\tDONE\n"
 
-peer_file="./protos/jellyfish/peer_notifications.proto"
+peer_file="./protos/fishjam/peer_notifications.proto"
 printf "Compiling: file $peer_file\n"
 protoc -I . --python_betterproto_out=./tests/support/protos $peer_file
 printf "\tDONE\n"

compile_proto.sh

@@ -1,34 +1,34 @@
 version: "3"
 
 services:
-  jellyfish:
-    image: "ghcr.io/fishjam-dev/jellyfish:${TAG:-edge}"
-    container_name: jellyfish
+  fishjam:
+    image: "ghcr.io/fishjam-dev/fishjam:${TAG:-edge}"
+    container_name: fishjam
     restart: on-failure
     healthcheck:
       test: >
-        curl --fail -H "authorization: Bearer development" http://jellyfish:5002/room || exit 1
+        curl --fail -H "authorization: Bearer development" http://fishjam:5002/room || exit 1
       interval: 3s
       retries: 2
       timeout: 2s
       start_period: 30s
     environment:
-      JF_HOST: "jellyfish:5002"
-      JF_INTEGRATED_TURN_IP: "${INTEGRATED_TURN_IP:-127.0.0.1}"
-      JF_INTEGRATED_TURN_LISTEN_IP: "0.0.0.0"
-      JF_INTEGRATED_TURN_PORT_RANGE: "50000-50050"
-      JF_INTEGRATED_TCP_TURN_PORT: "49999"
-      JF_SERVER_API_TOKEN: "development"
-      JF_PORT: 5002
-      JF_SECRET_KEY_BASE: "super-secret-key"
-      JF_SIP_USED: "true"
-      JF_SIP_IP: "127.0.0.1"
+      FJ_HOST: "fishjam:5002"
+      FJ_INTEGRATED_TURN_IP: "${INTEGRATED_TURN_IP:-127.0.0.1}"
+      FJ_INTEGRATED_TURN_LISTEN_IP: "0.0.0.0"
+      FJ_INTEGRATED_TURN_PORT_RANGE: "50000-50050"
+      FJ_INTEGRATED_TCP_TURN_PORT: "49999"
+      FJ_SERVER_API_TOKEN: "development"
+      FJ_PORT: 5002
+      FJ_SECRET_KEY_BASE: "super-secret-key"
+      FJ_SIP_IP: "127.0.0.1"
+      FJ_COMPONENTS_USED: rtsp file hls recording sip
     ports:
       - "5002:5002"
       - "49999:49999"
       - "50000-50050:50000-50050/udp"
     volumes:
-      - ./tests/fixtures:/app/jellyfish_resources/file_component_sources
+      - ./tests/fixtures:/app/fishjam_resources/file_component_sources
 
   test:
     container_name: test
@@ -41,7 +41,7 @@ services:
     volumes:
       - .:/app
     depends_on:
-      jellyfish:
+      fishjam:
         condition: service_healthy
 
   examples:
@@ -54,5 +54,5 @@ services:
     volumes:
       - .:/app
     depends_on:
-      jellyfish:
+      fishjam:
         condition: service_healthy

docker-compose-test.yaml

@@ -1,20 +1,20 @@
 import asyncio
 import os
 
-from jellyfish import (
+from fishjam import (
     ComponentOptionsFile,
     ComponentOptionsHLS,
     ComponentOptionsHLSSubscribeMode,
     Notifier,
     RoomApi,
 )
-from jellyfish.events import (
+from fishjam.events import (
     ServerMessageHlsPlayable,
     ServerMessageTrackAdded,
     ServerMessageTrackType,
 )
 
-HOST = "jellyfish" if os.getenv("DOCKER_TEST") == "TRUE" else "localhost"
+HOST = "fishjam" if os.getenv("DOCKER_TEST") == "TRUE" else "localhost"
 SERVER_ADDRESS = f"{HOST}:5002"
 
 
@@ -55,9 +55,9 @@ async def test_notifier():
     # that allow to use HLS.
     address, room = room_api.create_room(video_codec="h264")
 
-    # Create new room api with returned jellyfish address as a room could be
-    # created on a different jellyfish instance
-    # (if you communicate with a cluster of jellyfishes)
+    # Create new room api with returned fishjam address as a room could be
+    # created on a different fishjam instance
+    # (if you communicate with a cluster of fishjames)
     room_api = RoomApi(server_address=address)
 
     # Add HLS component with manual subscribe mode

docs/index.md

@@ -1,17 +1,17 @@
 import os
 
-from jellyfish import ComponentOptionsHLS, PeerOptionsWebRTC, RoomApi
+from fishjam import ComponentOptionsHLS, PeerOptionsWebRTC, RoomApi
 
-HOST = "jellyfish" if os.getenv("DOCKER_TEST") == "TRUE" else "localhost"
+HOST = "fishjam" if os.getenv("DOCKER_TEST") == "TRUE" else "localhost"
 SERVER_ADDRESS = f"{HOST}:5002"
 
 # Create a room
 room_api = RoomApi(server_address=SERVER_ADDRESS, server_api_token="development")
 
-jellyfish_address, room = room_api.create_room(
+fishjam_address, room = room_api.create_room(
     video_codec="h264", webhook_url="http://localhost:5000/webhook"
 )
-print((jellyfish_address, room))
+print((fishjam_address, room))
 
 # Add peer to the room
 result = room_api.add_peer(room.id, options=PeerOptionsWebRTC())

docs/server_notifications.md

@@ -1,10 +1,10 @@
 import asyncio
 import os
 
-from jellyfish import Notifier, RoomApi
-from jellyfish.events import ServerMessageTrackAdded, ServerMessageTrackType
+from fishjam import Notifier, RoomApi
+from fishjam.events import ServerMessageTrackAdded, ServerMessageTrackType
 
-HOST = "jellyfish" if os.getenv("DOCKER_TEST") == "TRUE" else "localhost"
+HOST = "fishjam" if os.getenv("DOCKER_TEST") == "TRUE" else "localhost"
 SERVER_ADDRESS = f"{HOST}:5002"
 
 notifier = Notifier(server_address=SERVER_ADDRESS, server_api_token="development")

examples/mini_tutorial.py

@@ -5,10 +5,10 @@
 # pylint: disable=locally-disabled, no-name-in-module, import-error
 
 # Exceptions and Server Messages
-from jellyfish import errors, events
+from fishjam import errors, events
 
 # Models
-from jellyfish._openapi_client.models import (
+from fishjam._openapi_client.models import (
     ComponentFile,
     ComponentHLS,
     ComponentOptionsFile,
@@ -40,10 +40,10 @@
 )
 
 # API
-from jellyfish._webhook_notifier import receive_binary
-from jellyfish._ws_notifier import Notifier
-from jellyfish.api._recording_api import RecordingApi
-from jellyfish.api._room_api import RoomApi
+from fishjam._webhook_notifier import receive_binary
+from fishjam._ws_notifier import Notifier
+from fishjam.api._recording_api import RecordingApi
+from fishjam.api._room_api import RoomApi
 
 __all__ = [
     "RoomApi",