fix: some

Author: dreamerblue

src/common/modules/live-contest/live-contest.dto.ts

@@ -20,3 +20,25 @@ export class GetContestAllBroadcasterInfoRespDTOItem {
 export class GetContestAllBroadcasterInfoRespDTO {
   public broadcasters: Record<string, GetContestAllBroadcasterInfoRespDTOItem>;
 }
+
+export class GetContestAllShotInfoReqDTO {
+  @FromQuery()
+  @IsString()
+  @IsNotEmpty()
+  public uca: string;
+}
+
+export class GetContestAllShotInfoRespDTOItem {
+  public shotId: string;
+  public shotName: string;
+  public status: 'ready' | 'broadcasting';
+  public tracks: {
+    trackId: string;
+    type: 'video' | 'audio';
+  }[];
+  public broadcastingTrackIds: string[];
+}
+
+export class GetContestAllShotInfoRespDTO {
+  public shots: Record<string, GetContestAllShotInfoRespDTOItem>;
+}

src/server/modules/live-contest/live-contest.controller.ts

@@ -5,6 +5,8 @@ import AuthGuard from '@server/guards/auth.guard';
 import {
   GetContestAllBroadcasterInfoReqDTO,
   GetContestAllBroadcasterInfoRespDTO,
+  GetContestAllShotInfoReqDTO,
+  GetContestAllShotInfoRespDTO,
 } from '@common/modules/live-contest/live-contest.dto';
 import LiveContestService from './live-contest.service';
 
@@ -29,4 +31,16 @@ export default class LiveContestController {
       broadcasters: res,
     };
   }
+
+  @Get()
+  @UseGuards(AuthGuard)
+  @Contract(GetContestAllShotInfoReqDTO, GetContestAllShotInfoRespDTO)
+  public async getContestAllShotInfo(
+    @Data() data: GetContestAllShotInfoReqDTO,
+  ): Promise<GetContestAllShotInfoRespDTO> {
+    const res = await this.service.getAllShotStoreInfo(data.uca);
+    return {
+      shots: res,
+    };
+  }
 }

src/server/modules/live-contest/live-contest.service.ts

@@ -49,6 +49,7 @@ export interface ShotStoreTrackItem {
 export type ShotStoreTracks = ShotStoreTrackItem[];
 
 export interface ShotStoreInfo {
+  shotId: string;
   shotName: string;
   status: 'ready' | 'broadcasting';
   tracks: ShotStoreTrackItem[];
@@ -251,4 +252,16 @@ export default class LiveContestService {
     }
     this.shotStoreMap.get(uca)!.delete(shotId);
   }
+
+  public getAllShotStoreInfo(uca: string): Record<string, ShotStoreInfo> {
+    if (!this.shotStoreMap.has(uca)) {
+      return {};
+    }
+    const res = this.shotStoreMap.get(uca)!;
+    const obj: Record<string, ShotStoreInfo> = {};
+    res.forEach((value, key) => {
+      obj[key] = value;
+    });
+    return obj;
+  }
 }

src/server/modules/socket-io/socket-io.ts

@@ -613,6 +613,7 @@ export default class SocketIOServer {
         socket.join(this.getShotLogicRoomKey(uca, id));
 
         this.liveContestService.setShotStore(uca, id, {
+          shotId: id,
           shotName: data.shotName,
           status: 'ready',
           tracks: data.tracks,
@@ -631,7 +632,7 @@ export default class SocketIOServer {
         mediaRoom.peers.set(id, shotPeer);
         mediaRoom.shots.set(id, shotPeer);
 
-        console.log(`[socket] [/shot] [confirmReady] [${uca}:${id}] joined shot: ${id}`);
+        console.log(`[socket] [/shot] [confirmReady] [${uca}:${id}] joined shot: ${data.shotName}`);
 
         return {
           transport: {
@@ -952,6 +953,7 @@ export default class SocketIOServer {
         room.peers.delete(id);
       }
     }
+    this.liveContestService.delShotStore(uca, id);
   }
 }