Skip to content

Commit 707bf95

Browse files
dreamerbluedreamerblue
committed
chore: up logs
1 parent 143881e commit 707bf95

1 file changed

Lines changed: 18 additions & 18 deletions

File tree

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

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ export default class SocketIOServer {
125125
* confirmReady: 确认准备就绪，服务端创建 media room 并创建 transport
126126
*/
127127
registerSocketEvent(socket, 'confirmReady', async (data: { tracks: BroadcasterStoreTracks }) => {
128-
console.log(`[socket.confirmReady] [${alias}:${userId}] data:`, data);
128+
console.log(`[socket.confirmReady] [${alias}:${userId}:${broadcasterId}] data:`, data);
129129
socket.join(this.getBroadcasterRoomKey(alias, userId));
130130

131131
await this.liveContestService.setBroadcasterStoreInfo(alias, userId, {
@@ -152,8 +152,8 @@ export default class SocketIOServer {
152152
room.peers.set(broadcasterId, broadcasterPeer);
153153
room.broadcaster = broadcasterPeer; // alias to peers[broadcasterId]
154154
this.mediaRooms.set(roomKey, room);
155-
console.log(`[socket.confirmReady] [${alias}:${userId}] created media room: ${roomKey}`);
156-
console.log(`[socket.confirmReady] [${alias}:${userId}] joined broadcaster: ${broadcasterId}`);
155+
console.log(`[socket.confirmReady] [${alias}:${userId}:${broadcasterId}] created media room: ${roomKey}`);
156+
console.log(`[socket.confirmReady] [${alias}:${userId}:${broadcasterId}] joined broadcaster: ${broadcasterId}`);
157157

158158
// temp trigger requestStartBroadcast
159159
// setTimeout(async () => {
@@ -175,13 +175,13 @@ export default class SocketIOServer {
175175
});
176176

177177
registerSocketEvent(socket, 'cancelReady', async () => {
178-
console.log(`[socket.cancelReady] [${alias}:${userId}]`);
178+
console.log(`[socket.cancelReady] [${alias}:${userId}:${broadcasterId}]`);
179179
socket.leave(this.getBroadcasterRoomKey(alias, userId));
180180
await this.clearRoomAndAllData(alias, userId);
181181
});
182182

183183
registerSocketEvent(socket, 'completeConnectTransport', async (data: { dtlsParameters: DtlsParameters }) => {
184-
console.log(`[socket.completeConnectTransport] [${alias}:${userId}] data:`, data);
184+
console.log(`[socket.completeConnectTransport] [${alias}:${userId}:${broadcasterId}] data:`, data);
185185
const mediaRoom = this.mediaRooms.get(this.getMediaRoomKey(alias, userId));
186186
if (!mediaRoom) {
187187
throw new LogicException(ErrCode.BroadcastMediaRoomBroken);
@@ -194,7 +194,7 @@ export default class SocketIOServer {
194194
dtlsParameters: data.dtlsParameters,
195195
});
196196
console.log(
197-
`[socket.completeConnectTransport] [${alias}:${userId}] connected to transport:`,
197+
`[socket.completeConnectTransport] [${alias}:${userId}:${broadcasterId}] connected to transport:`,
198198
peer.transport.id,
199199
);
200200
});
@@ -203,7 +203,7 @@ export default class SocketIOServer {
203203
socket,
204204
'produce',
205205
async (data: { trackId: string; kind: MediaKind; rtpParameters: RtpParameters }) => {
206-
console.log(`[socket.produce] [${alias}:${userId}] data:`, data);
206+
console.log(`[socket.produce] [${alias}:${userId}:${broadcasterId}] data:`, data);
207207
const mediaRoom = this.mediaRooms.get(this.getMediaRoomKey(alias, userId));
208208
if (!mediaRoom) {
209209
throw new LogicException(ErrCode.BroadcastMediaRoomBroken);
@@ -222,7 +222,7 @@ export default class SocketIOServer {
222222
trackId: data.trackId,
223223
},
224224
});
225-
console.log(`[socket.produce] [${alias}:${userId}] produced track:`, producer.id);
225+
console.log(`[socket.produce] [${alias}:${userId}:${broadcasterId}] produced track:`, producer.id);
226226
peer.trackProducers?.set(data.trackId, producer);
227227
const info = await this.liveContestService.getBroadcasterStoreInfo(alias, userId);
228228
if (info) {
@@ -275,7 +275,7 @@ export default class SocketIOServer {
275275

276276
registerSocketEvent(socket, 'startBroadcast', async (data: { trackIds: string[] }) => {
277277
const info = await this.liveContestService.getBroadcasterStoreInfo(alias, userId);
278-
if (!info || info.status !== 'ready') {
278+
if (!info || !['ready', 'broadcasting'].includes(info.status)) {
279279
throw new LogicException(ErrCode.BroadcastNotReady);
280280
}
281281
const tracks = await this.liveContestService.getBroadcasterStoreTracks(alias, userId);
@@ -294,10 +294,10 @@ export default class SocketIOServer {
294294
const availableTracks = data.trackIds.filter((trackId) => {
295295
return tracks.some((track: any) => track.trackId === trackId);
296296
});
297-
console.log(`[socket.startBroadcast] [${alias}:${userId}] tracks:`, availableTracks);
297+
console.log(`[socket.startBroadcast] [${alias}:${userId}:${viewerId}] checking available tracks:`, availableTracks);
298298
if (availableTracks.length > 0) {
299299
console.log(
300-
`[socket.emit.requestStartBroadcast] [${alias}:${userId}] requesting start broadcast to broadcaster`,
300+
`[socket.emit.requestStartBroadcast] [${alias}:${userId}:${viewerId}] requesting start broadcast to broadcaster`,
301301
);
302302
this.broadcasterNsp.to(this.getBroadcasterRoomKey(alias, userId)).emit('requestStartBroadcast', {
303303
trackIds: availableTracks,
@@ -327,7 +327,7 @@ export default class SocketIOServer {
327327
};
328328
mediaRoom.peers.set(viewerId, viewerPeer);
329329
mediaRoom.viewers.set(viewerId, viewerPeer); // alias to peers[viewerId]
330-
console.log(`[socket.joinBroadcastRoom] [${alias}:${userId}] joined viewer:`, viewerId);
330+
console.log(`[socket.joinBroadcastRoom] [${alias}:${userId}:${viewerId}] joined viewer:`, viewerId);
331331
return {
332332
transport: {
333333
id: transport.id,
@@ -340,7 +340,7 @@ export default class SocketIOServer {
340340
});
341341

342342
registerSocketEvent(socket, 'completeConnectTransport', async (data: { dtlsParameters: DtlsParameters }) => {
343-
console.log(`[socket.completeConnectTransport] [${alias}:${userId}] data:`, data);
343+
console.log(`[socket.completeConnectTransport] [${alias}:${userId}:${viewerId}] data:`, data);
344344
const mediaRoom = this.mediaRooms.get(this.getMediaRoomKey(alias, userId));
345345
if (!mediaRoom) {
346346
throw new LogicException(ErrCode.BroadcastMediaRoomBroken);
@@ -353,7 +353,7 @@ export default class SocketIOServer {
353353
dtlsParameters: data.dtlsParameters,
354354
});
355355
console.log(
356-
`[socket.completeConnectTransport] [${alias}:${userId}] connected to transport:`,
356+
`[socket.completeConnectTransport] [${alias}:${userId}:${viewerId}] connected to transport:`,
357357
peer.transport.id,
358358
);
359359
});
@@ -367,7 +367,7 @@ export default class SocketIOServer {
367367
paused?: boolean;
368368
preferredLayers?: ConsumerLayers;
369369
}) => {
370-
console.log(`[socket.consume] [${alias}:${userId}] data:`, data);
370+
console.log(`[socket.consume] [${alias}:${userId}:${viewerId}] data:`, data);
371371
const mediaRoom = this.mediaRooms.get(this.getMediaRoomKey(alias, userId));
372372
if (!mediaRoom) {
373373
throw new LogicException(ErrCode.BroadcastMediaRoomBroken);
@@ -403,7 +403,7 @@ export default class SocketIOServer {
403403
trackId: data.trackId,
404404
},
405405
});
406-
console.log(`[socket.consume] [${alias}:${userId}] consumed track:`, consumer.id);
406+
console.log(`[socket.consume] [${alias}:${userId}:${viewerId}] consumed track:`, consumer.id);
407407
return {
408408
consumerId: consumer.id,
409409
producerId: producer.id,
@@ -417,14 +417,14 @@ export default class SocketIOServer {
417417
);
418418

419419
registerSocketEvent(socket, 'stopBroadcast', async () => {
420-
console.log(`[socket.stopBroadcast] [${alias}:${userId}]`);
420+
console.log(`[socket.stopBroadcast] [${alias}:${userId}:${viewerId}]`);
421421
const mediaRoom = this.mediaRooms.get(this.getMediaRoomKey(alias, userId));
422422
if (!mediaRoom) {
423423
throw new LogicException(ErrCode.BroadcastMediaRoomBroken);
424424
}
425425
this.broadcasterNsp.to(this.getBroadcasterRoomKey(alias, userId)).emit('requestStopBroadcast', async () => {
426426
console.log(
427-
`[socket.emit.requestStopBroadcast] [${alias}:${userId}] received broadcaster ack, cleaning up producers`,
427+
`[socket.emit.requestStopBroadcast] [${alias}:${userId}:${viewerId}] received broadcaster ack, cleaning up producers`,
428428
);
429429
// 仅清理 producers 相关，不关闭 transport
430430
const info = await this.liveContestService.getBroadcasterStoreInfo(alias, userId);

0 commit comments

Comments
 (0)