Add classic streams

vtm9 · vtm9 · commit 78f1381edb92 · 2025-06-17T23:45:56.000+02:00
diff --git a/services/app/apps/codebattle/assets/js/app.js b/services/app/apps/codebattle/assets/js/app.js
@@ -46,6 +46,7 @@ import {
   renderEventPage,
   renderTournamentPlayerPage,
   renderUserPage,
+  renderStreamPage,
   renderUsersRating,
 } from './widgets';
 
@@ -94,6 +95,7 @@ const gameWidgetRoot = document.getElementById('game-widget-root');
 const heatmapRoot = document.getElementById('heatmap-root');
 const onlineRoot = document.getElementById('online-root');
 const invitesRoot = document.getElementById('invites-root');
+const streamRoot = document.getElementById('stream-classic-root');
 const lobbyRoot = document.getElementById('lobby-root');
 const ratingList = document.getElementById('rating-list');
 const registrationRoot = document.getElementById('registration');
@@ -164,3 +166,8 @@ if (onlineRoot) {
 if (invitesRoot) {
   renderInvitesWidget(invitesRoot);
 }
+
+if (streamRoot) {
+  renderStreamPage(streamRoot);
+}
+
diff --git a/services/app/apps/codebattle/assets/js/socket.js b/services/app/apps/codebattle/assets/js/socket.js
@@ -66,6 +66,8 @@ export const channelTopics = {
   waitingRoomPlayerMatchmakingStoppedTopic: 'waiting_room:player:matchmaking_stopped',
   waitingRoomPlayerMatchmakingPausedTopic: 'waiting_room:player:matchmaking_paused',
   waitingRoomPlayerMatchCreatedTopic: 'waiting_room:player:match_created',
+
+  streamActiveGameSelectedTopic: 'stream:active_game_selected',
 };
 
 export const channelMethods = {
@@ -104,6 +106,7 @@ export const channelMethods = {
   matchmakingPause: 'matchmaking:pause',
   matchmakingResume: 'matchmaking:resume',
   matchmakingRestart: 'matchmaking:restart',
+
 };
 
 socket.connect();
diff --git a/services/app/apps/codebattle/assets/js/widgets/App.jsx b/services/app/apps/codebattle/assets/js/widgets/App.jsx
@@ -71,7 +71,7 @@ const UserProfile = React.lazy(() => import('./pages/profile'));
 const Registration = React.lazy(() => import('./pages/registration'));
 const Tournament = React.lazy(() => import('./pages/tournament'));
 const TournamentAdmin = React.lazy(() => import('./pages/tournament/TournamentAdminWidget'));
-const TournamentStream = React.lazy(() => import('./pages/tournament/TournamentAdminWidget'));
+const Stream = React.lazy(() => import('./pages/stream/StreamWidget'));
 const EventWidget = React.lazy(() => import('./pages/event'));
 const TournamentPlayer = React.lazy(() => import('./pages/tournamentPlayer'));
 
@@ -232,3 +232,13 @@ export const TournamentPlayerPage = () => (
     </PersistGate>
   </Provider>
 );
+
+export const StreamPage = () => (
+  <Provider store={store}>
+    <PersistGate loading={null} persistor={persistor}>
+      <Suspense>
+        <Stream />
+      </Suspense>
+    </PersistGate>
+  </Provider>
+);
diff --git a/services/app/apps/codebattle/assets/js/widgets/index.jsx b/services/app/apps/codebattle/assets/js/widgets/index.jsx
@@ -17,6 +17,7 @@ import {
   TournamentPlayerPage,
   UserPage,
   UsersRating,
+  StreamPage,
 } from './App';
 
 const Heatmap = React.lazy(() => import('./pages/profile/Heatmap'));
@@ -36,3 +37,5 @@ export const renderEventPage = domElement => createRoot(domElement).render(<Even
 export const renderTournamentPlayerPage = domElement => createRoot(domElement).render(<TournamentPlayerPage />);
 export const renderUserPage = domElement => createRoot(domElement).render(<UserPage />);
 export const renderUsersRating = domElement => createRoot(domElement).render(<UsersRating />);
+export const renderStreamPage = domElement => createRoot(domElement).render(<StreamPage />);
+
diff --git a/services/app/apps/codebattle/assets/js/widgets/middlewares/Stream.js b/services/app/apps/codebattle/assets/js/widgets/middlewares/Stream.js
@@ -0,0 +1,29 @@
+import Gon from 'gon';
+
+import { channelTopics } from '../../socket';
+import { actions } from '../slices';
+
+import Channel from './Channel';
+
+const tournamentId = Gon.getAsset('tournament_id');
+
+const channel = new Channel();
+
+const establishStream = dispatch => {
+  const getDispatchActionHandler = actionCreator => data => dispatch(actionCreator(data));
+
+  channel.join().receive('ok', () => {});
+
+  const handleActiveGame = getDispatchActionHandler(actions.setGameId);
+
+  return channel
+    .addListener(channelTopics.streamActiveGameSelectedTopic, handleActiveGame)
+};
+
+export const connectToStream = () => dispatch => {
+  const page = `stream:${tournamentId}`;
+  channel.setupChannel(page);
+  const currentChannel = establishStream(dispatch);
+
+  return currentChannel;
+};
diff --git a/services/app/apps/codebattle/assets/js/widgets/middlewares/TournamentAdmin.js b/services/app/apps/codebattle/assets/js/widgets/middlewares/TournamentAdmin.js
@@ -329,3 +329,9 @@ export const getTask = (taskId, onSuccess) => () => {
       onSuccess(data.descriptionRu);
     });
 };
+
+export const pushActiveMatchToStream = (gameId) => () => {
+  channel
+    .push('tournament:stream:active_game', { gameId })
+    .receive('error', error => console.error(error));
+};
diff --git a/services/app/apps/codebattle/assets/js/widgets/pages/stream/StreamWidget.jsx b/services/app/apps/codebattle/assets/js/widgets/pages/stream/StreamWidget.jsx
@@ -0,0 +1,19 @@
+import React, { useEffect } from 'react';
+
+import { useDispatch, useSelector } from 'react-redux';
+import { connectToStream} from '../../middlewares/Stream';
+
+function StreamWidget() {
+  const dispatch = useDispatch();
+  const gameId = useSelector(state => state.game.id);
+  
+  console.log(gameId)
+  useEffect(() => {
+    dispatch(connectToStream());
+  }, []);
+  
+  return <div>Stream Widget</div>;
+}   
+
+export default StreamWidget;
+
diff --git a/services/app/apps/codebattle/assets/js/widgets/pages/tournament/TournamentAdminWidget.jsx b/services/app/apps/codebattle/assets/js/widgets/pages/tournament/TournamentAdminWidget.jsx
@@ -5,6 +5,7 @@ import Gon from 'gon';
 
 import { connectToTournament, requestMatchesForRound} from '../../middlewares/TournamentAdmin';
 import * as selectors from '../../selectors';
+import { pushActiveMatchToStream } from '../../middlewares/TournamentAdmin';
 
 function TournamentAdminWidget() {
   const tournamentId = Gon.getAsset('tournament_id');
@@ -106,6 +107,7 @@ function TournamentAdminWidget() {
           return (
             <button 
               key={match.id} 
+              onClick={() => dispatch(pushActiveMatchToStream(match.gameId))}
               className={`btn ${buttonClass} btn-sm me-1 mb-1`}
               title={`Match ID: ${match.id}, State: ${match.state}, Started: ${new Date(match.startedAt).toLocaleTimeString()}`}
             >
diff --git a/services/app/apps/codebattle/assets/js/widgets/slices/game.js b/services/app/apps/codebattle/assets/js/widgets/slices/game.js
@@ -11,6 +11,9 @@ const game = createSlice({
   name: 'game',
   initialState,
   reducers: {
+    setGameId: (state, { payload: { id } }) => {
+      state.id = id;
+    },
     clearGameStatus: state => {
       state.gameStatus = defaultGameStatusState;
     },
diff --git a/services/app/apps/codebattle/assets/js/widgets/slices/initial.js b/services/app/apps/codebattle/assets/js/widgets/slices/initial.js
@@ -499,6 +499,7 @@ const defaultTournamentPlayerParams = {
  */
 export default {
   game: {
+    id: null,
     gameStatus: initialGameStatus,
     award: initialGameAward,
     awardStatus: 'idle',
diff --git a/services/app/apps/codebattle/lib/codebattle/pub_sub/events.ex b/services/app/apps/codebattle/lib/codebattle/pub_sub/events.ex
@@ -588,6 +588,16 @@ defmodule Codebattle.PubSub.Events do
     ]
   end
 
+  def get_messages("tournament:stream:active_game", params) do
+    [
+      %Message{
+        topic: "tournament:#{params.tournament_id}:stream",
+        event: "tournament:stream:active_game",
+        payload: %{game_id: params.game_id}
+      }
+    ]
+  end
+
   defp chat_topic(:lobby), do: "chat:lobby"
   defp chat_topic({:tournament, id}), do: "chat:tournament:#{id}"
   defp chat_topic({:game, id}), do: "chat:game:#{id}"
diff --git a/services/app/apps/codebattle/lib/codebattle/tournament/helpers.ex b/services/app/apps/codebattle/lib/codebattle/tournament/helpers.ex
@@ -3,14 +3,16 @@ defmodule Codebattle.Tournament.Helpers do
   alias Codebattle.Tournament
   alias Codebattle.User
 
-  def get_player(%{players_table: nil} = tournament, id), do: Map.get(tournament.players, to_id(id))
+  def get_player(%{players_table: nil} = tournament, id),
+    do: Map.get(tournament.players, to_id(id))
 
   def get_player(tournament, id), do: Tournament.Players.get_player(tournament, id)
 
   def get_players(%{players_table: nil} = tournament), do: Map.values(tournament.players)
   def get_players(tournament), do: Tournament.Players.get_players(tournament)
 
-  def get_players(%{players_table: nil} = tournament, ids), do: Enum.map(ids, &get_player(tournament, &1))
+  def get_players(%{players_table: nil} = tournament, ids),
+    do: Enum.map(ids, &get_player(tournament, &1))
 
   def get_players(tournament, ids), do: Tournament.Players.get_players(tournament, ids)
 
@@ -44,20 +46,23 @@ defmodule Codebattle.Tournament.Helpers do
     tournament |> get_team_players(team_id) |> Enum.count()
   end
 
-  def get_match(%{matches_table: nil} = tournament, id), do: Map.get(tournament.matches, to_id(id))
+  def get_match(%{matches_table: nil} = tournament, id),
+    do: Map.get(tournament.matches, to_id(id))
 
   def get_match(tournament, id), do: Tournament.Matches.get_match(tournament, id)
 
   def get_matches(%{matches_table: nil} = tournament), do: Map.values(tournament.matches)
   def get_matches(tournament), do: Tournament.Matches.get_matches(tournament)
 
-  def get_matches(tournament, ids) when is_list(ids), do: Enum.map(ids, &get_match(tournament, &1))
+  def get_matches(tournament, ids) when is_list(ids),
+    do: Enum.map(ids, &get_match(tournament, &1))
 
   def get_matches(tournament, state) when is_binary(state) do
     tournament |> get_matches() |> Enum.filter(&(&1.state == state))
   end
 
-  def get_matches(tournament, ids_or_state), do: Tournament.Matches.get_matches(tournament, ids_or_state)
+  def get_matches(tournament, ids_or_state),
+    do: Tournament.Matches.get_matches(tournament, ids_or_state)
 
   def get_matches_by_players(tournament, player_ids) do
     matches_ids =
@@ -125,7 +130,9 @@ defmodule Codebattle.Tournament.Helpers do
   def get_current_round_playing_matches(tournament) do
     tournament
     |> get_matches()
-    |> Enum.filter(&(&1.round_position == tournament.current_round_position and &1.state == "playing"))
+    |> Enum.filter(
+      &(&1.round_position == tournament.current_round_position and &1.state == "playing")
+    )
   end
 
   def match_player?(match, player_id), do: Enum.any?(match.player_ids, &(&1 == player_id))
@@ -351,10 +358,17 @@ defmodule Codebattle.Tournament.Helpers do
     ])
   end
 
-  def get_players_total_games_count(%{task_provider: "task_pack", task_strategy: "sequential"} = t, _player) do
+  def get_players_total_games_count(
+        %{task_provider: "task_pack", task_strategy: "sequential"} = t,
+        _player
+      ) do
     t |> Tournament.Tasks.get_task_ids() |> Enum.count()
   end
 
   def get_players_total_games_count(_tournament, nil), do: 0
   def get_players_total_games_count(_tournament, player), do: Enum.count(player.matches_ids)
+
+  def get_player_ranking_stats(tournament) do
+    players = get_players(tournament)
+  end
 end
diff --git a/services/app/apps/codebattle/lib/codebattle/tournament/player.ex b/services/app/apps/codebattle/lib/codebattle/tournament/player.ex
@@ -24,6 +24,7 @@ defmodule Codebattle.Tournament.Player do
     :rating,
     :score,
     :team_id,
+    :in_main_draw,
     :wr_joined_at,
     :wins_count
   ]
@@ -43,6 +44,7 @@ defmodule Codebattle.Tournament.Player do
     field(:clan_id, :integer)
     field(:id, :integer)
     field(:is_bot, :boolean)
+    field(:in_main_draw, :boolean, default: true)
     field(:lang, :string)
     field(:matches_ids, {:array, :integer}, default: [])
     field(:name, :string)
diff --git a/services/app/apps/codebattle/lib/codebattle/tournament/storage/players.ex b/services/app/apps/codebattle/lib/codebattle/tournament/storage/players.ex
@@ -45,4 +45,13 @@ defmodule Codebattle.Tournament.Players do
       get_player(tournament, player_id)
     end)
   end
+
+  def move_players_from_main_draw(tournament, player_ids) do
+    Enum.each(player_ids, fn player_id ->
+      tournament
+      |> get_player(player_id)
+      |> Map.put(:in_main_draw, false)
+      |> then(&put_player(tournament, &1))
+    end)
+  end
 end
diff --git a/services/app/apps/codebattle/lib/codebattle/tournament/strategy/top200.ex b/services/app/apps/codebattle/lib/codebattle/tournament/strategy/top200.ex
diff --git a/services/app/apps/codebattle/lib/codebattle_web/channels/tournament_admin_channel.ex b/services/app/apps/codebattle/lib/codebattle_web/channels/tournament_admin_channel.ex
diff --git a/services/app/apps/codebattle/lib/codebattle_web/channels/tournament_stream_channel.ex b/services/app/apps/codebattle/lib/codebattle_web/channels/tournament_stream_channel.ex
diff --git a/services/app/apps/codebattle/lib/codebattle_web/channels/user_socket.ex b/services/app/apps/codebattle/lib/codebattle_web/channels/user_socket.ex
diff --git a/services/app/apps/codebattle/lib/codebattle_web/controllers/ext_api/tourtnament_controller.ex b/services/app/apps/codebattle/lib/codebattle_web/controllers/ext_api/tourtnament_controller.ex
diff --git a/services/app/apps/codebattle/lib/codebattle_web/controllers/stream_controller.ex b/services/app/apps/codebattle/lib/codebattle_web/controllers/stream_controller.ex
diff --git a/services/app/apps/codebattle/lib/codebattle_web/templates/stream/index_classic.html.heex b/services/app/apps/codebattle/lib/codebattle_web/templates/stream/index_classic.html.heex
