Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions src/lib/schema.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,23 @@ const roomIdPeerIdSchema = z.object({
export const ValidationSchema = {
roomIdPeerId: roomIdPeerIdSchema,
createPeer: roomIdPeerIdSchema.extend({
rtpCapabilities: z.any(),
deviceRtpCapabilities: z
.any()
.refine(value => value, 'Can not be null or undefined'),
peerType: z.enum(['Participant', 'Recorder']),
}),

connectWebRtcTransport: roomIdPeerIdSchema.extend({
transportId: z.string(),
dtlsParameters: z.any(),
dtlsParameters: z
.any()
.refine(value => value, 'Can not be null or undefined'),
}),

createProducer: roomIdPeerIdSchema.extend({
rtpParameters: z.any(),
rtpParameters: z
.any()
.refine(value => value, 'Can not be null or undefined'),
transportId: z.string(),
kind: z.enum(['audio', 'video']),
appData: z.any(),
Expand Down
22 changes: 11 additions & 11 deletions src/servers/grpc-server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -310,9 +310,9 @@ class GrpcServer extends EventEmitter {
const stats = this.getStats();
const memoryUsage = process.memoryUsage();

console.log(
`💗 Health Check - Active: ${stats.activeConnections}, Memory: ${Math.round(memoryUsage.heapUsed / 1024 / 1024)}MB`
);
// console.log(
// `💗 Health Check - Active: ${stats.activeConnections}, Memory: ${Math.round(memoryUsage.heapUsed / 1024 / 1024)}MB`
// );

this.emit('healthCheck', {
stats,
Expand All @@ -323,8 +323,8 @@ class GrpcServer extends EventEmitter {
// Check for memory leaks
if (memoryUsage.heapUsed > 512 * 1024 * 1024) {
// 512MB threshold
console.warn('⚠️ High memory usage detected:', memoryUsage);
this.emit('memoryWarning', { memoryUsage, timestamp: new Date() });
// console.warn('⚠️ High memory usage detected:', memoryUsage);
// this.emit('memoryWarning', { memoryUsage, timestamp: new Date() });
}
} catch (error) {
console.error('❌ Health check failed:', error);
Expand All @@ -333,12 +333,12 @@ class GrpcServer extends EventEmitter {

private reportMetrics(): void {
const stats = this.getStats();
console.log(`📊 Server Metrics:`, {
uptime: `${Math.round(stats.uptime / 1000 / 60)}min`,
connections: `${stats.activeConnections}/${stats.totalConnections}`,
messages: `R:${stats.totalMessagesReceived} S:${stats.totalMessagesSent}`,
errors: stats.errors,
});
// console.log(`📊 Server Metrics:`, {
// uptime: `${Math.round(stats.uptime / 1000 / 60)}min`,
// connections: `${stats.activeConnections}/${stats.totalConnections}`,
// messages: `R:${stats.totalMessagesReceived} S:${stats.totalMessagesSent}`,
// errors: stats.errors,
// });

this.emit('metricsReport', { stats, timestamp: new Date() });
}
Expand Down
14 changes: 7 additions & 7 deletions src/services/peer.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
import EventEmitter from 'events';
import { types as mediasoupTypes } from 'mediasoup';
import { PeerType, ProducerSource } from '../types';
import { PeerType, ProducerSource, ResponseData } from '../types';
import { mediaSoupServer } from '../servers/mediasoup-server';
import SignalNode from './signalnode';
import { Actions } from '../types/actions';
import { MessageResponse } from '../protos/gen/mediaSignalingPackage/MessageResponse';
import Room from './room';

class Peer extends EventEmitter {
Expand All @@ -22,28 +21,28 @@ class Peer extends EventEmitter {
private router: mediasoupTypes.Router;
workerPid: number;

static peers = new Map<string, Peer>();
// static peers = new Map<string, Peer>();

constructor({
id,
roomId,
router,
rtpCapabilities,
deviceRtpCapabilities,
signalnode,
type,
}: {
id: string;
roomId: string;
router: mediasoupTypes.Router;
rtpCapabilities: mediasoupTypes.RtpCapabilities;
deviceRtpCapabilities: mediasoupTypes.RtpCapabilities;
signalnode: SignalNode;
type: PeerType;
}) {
super();
this.id = id;
this.roomId = roomId;
this.closed = false;
this.deviceRtpCapabilities = rtpCapabilities;
this.deviceRtpCapabilities = deviceRtpCapabilities;
this.router = router;
this.workerPid = (router.appData.worker as mediasoupTypes.Worker).pid;
this.transports = new Map();
Expand Down Expand Up @@ -91,7 +90,7 @@ class Peer extends EventEmitter {
async sendMessageForResponse(
action: Actions,
args?: { [key: string]: unknown }
): Promise<MessageResponse | null> {
): Promise<ResponseData> {
return this.signalnode.sendMessageForResponse(action, args);
}

Expand Down Expand Up @@ -146,6 +145,7 @@ class Peer extends EventEmitter {
// Producer methods
addProducer(producer: mediasoupTypes.Producer): void {
this.producers.set(producer.id, producer);
console.log('Add Producer', producer.id);
producer.observer.on('close', () => {
this.producers.delete(producer.id);
});
Expand Down
82 changes: 49 additions & 33 deletions src/services/signalnode.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import { ValidationSchema } from '../lib/schema';
import Room from './room';
import Peer from './peer';
import {
ResponseData,
ConnectionState,
PendingRequest,
ProducerSource,
Expand Down Expand Up @@ -153,7 +154,8 @@ class SignalNode extends EventEmitter {
pendingRequest.reject(parsedArgs.error as Error);
} else {
console.log(action, 'pending request Returned success');
pendingRequest.resolve(message);
const response = parsedArgs.resolve as ResponseData;
pendingRequest.resolve(response);
}
this.pendingRequests.delete(requestId);
return;
Expand Down Expand Up @@ -301,12 +303,9 @@ class SignalNode extends EventEmitter {
async sendMessageForResponse(
action: Actions,
args?: { [key: string]: unknown }
): Promise<MessageResponse | null> {
): Promise<ResponseData> {
if (!this.call) {
console.warn(
`⚠️ Cannot send message to MediaNode ${this.id}: not connected`
);
return null;
throw `Cannot send message to MediaNode ${this.id}: not connected`;
}

try {
Expand All @@ -317,7 +316,7 @@ class SignalNode extends EventEmitter {
requestId,
};

return new Promise<MessageResponse>((resolve, reject) => {
return new Promise<ResponseData>((resolve, reject) => {
if (this.call) {
this.pendingRequests.set(requestId, {
resolve,
Expand Down Expand Up @@ -494,7 +493,7 @@ class SignalNode extends EventEmitter {
router: mediasoupTypes.Router,
type: TransportKind = 'consumer'
): Promise<mediasoupTypes.WebRtcTransport> {
if (router.appData.webRtcServer) throw 'Webrtc server not found';
if (!router.appData.webRtcServer) throw 'Webrtc server not found';
const webRtcServer = router.appData
.webRtcServer as mediasoupTypes.WebRtcServer;
const transport = await router.createWebRtcTransport({
Expand All @@ -520,6 +519,10 @@ class SignalNode extends EventEmitter {
room: Room;
}): Promise<void> {
try {
console.log(
'consumingPeer.getDeviceRTPCapabilities()',
consumingPeer.getDeviceRTPCapabilities()
);
if (
!consumingPeer.getRouter().canConsume({
producerId: producer.id,
Expand Down Expand Up @@ -570,26 +573,36 @@ class SignalNode extends EventEmitter {
consumingPeer.sendMessage(Actions.ResumeConsumer, options);
});

consumingPeer.sendMessageForResponse(Actions.CreateConsumer, {
peerId: consumingPeer.id,
peerType: consumingPeer.type,
roomId: room.roomId,
producerPeerId: producerPeerId,
producerId: producer.id,
transportId: transport.id,
producerSource: producer.appData.source,
id: consumer.id,
kind: consumer.kind,
rtpParameters: consumer.rtpParameters,
type: consumer.type,
producerPaused: consumer.producerPaused,

appData: {
...producer.appData,
producerPeerId,
consumingPeer
.sendMessageForResponse(Actions.ConsumerCreated, {
peerId: consumingPeer.id,
peerType: consumingPeer.type,
roomId: room.roomId,
producerPeerId: producerPeerId,
producerId: producer.id,
transportId: transport.id,
},
});
producerSource: producer.appData.source,
id: consumer.id,
kind: consumer.kind,
rtpParameters: consumer.rtpParameters,
type: consumer.type,
producerPaused: consumer.producerPaused,

appData: {
...producer.appData,
producerPeerId,
transportId: transport.id,
},
})
.then(async res => {
console.log('CreateConsumer Response -> resolved request', res);
// if (producer.appData.source === 'camera') return;
await consumer.resume();
console.log('resume consumer');
})
.catch(error => {
console.log('CreateConsumer | Resume Consumer', error);
});
console.log('Create consumer ---', producer.appData.source);
} catch (error) {
// callback('createConsumersForExistingPeers fialed')
Expand Down Expand Up @@ -629,16 +642,17 @@ class SignalNode extends EventEmitter {
if (!requestId) throw 'Request Id requested';

const data = ValidationSchema.createPeer.parse(args);
const { roomId, peerId, peerType, rtpCapabilities } = data;
const { roomId, peerId, peerType, deviceRtpCapabilities } = data;
const room = Room.getRoom(roomId) ?? (await Room.create(roomId));
console.log(Actions.CreatePeer, '=>', deviceRtpCapabilities);

const router = await room.assignRouterToPeer();
if (!router) throw 'Router not assigned to peer';
const peer = new Peer({
id: peerId,
roomId,
router,
rtpCapabilities,
deviceRtpCapabilities,
signalnode: this,
type: peerType,
});
Expand Down Expand Up @@ -691,14 +705,14 @@ class SignalNode extends EventEmitter {
peer.addTransport(consumerTransport);

this.sendResponse(Actions.CreateWebrtcTransports, requestId, {
producerTransportParams: {
sendTransportParams: {
id: producerTransport.id,
iceParameters: producerTransport.iceParameters,
iceCandidates: producerTransport.iceCandidates,
dtlsParameters: producerTransport.dtlsParameters,
sctpParameters: producerTransport.sctpParameters,
},
consumerTransportParams: {
recvTransportParams: {
id: consumerTransport.id,
iceParameters: consumerTransport.iceParameters,
iceCandidates: consumerTransport.iceCandidates,
Expand Down Expand Up @@ -736,7 +750,7 @@ class SignalNode extends EventEmitter {
const { roomId, peerId } = data;
const room = Room.getRoom(roomId);
const peer = room?.getPeer(peerId);

console.log(Actions.CreateConsumersOfAllProducers, 'START');
if (!room || !peer)
throw 'Failed to create webrtc transport: Peer/room not found';
const existingPeers = room.getPeers();
Expand Down Expand Up @@ -774,6 +788,7 @@ class SignalNode extends EventEmitter {
});
});
});
console.log(Actions.CreateConsumersOfAllProducers, 'END');
} catch (error) {
console.log(error);
}
Expand Down Expand Up @@ -822,7 +837,8 @@ class SignalNode extends EventEmitter {
// Create server-side consumer for each existing peers
const existingPeers = room.getPeers();
existingPeers.forEach(consumingPeer => {
if (consumingPeer.id === peerId) return;
if (consumingPeer.id === peerId)
return console.log('You are the one producing');
this.createConsumer({
consumingPeer,
producer: producer,
Expand Down
9 changes: 9 additions & 0 deletions src/types/actions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,18 @@ export enum Actions {
CloseConsumer = 'close_consumer',
ResumeConsumer = 'resume_consumer',
PauseConsumer = 'pause_consumer',

// consumed by client
ConsumerCreated = 'consumer_created',
ConsumerPaused = 'consumer_paused',
ConsumerResumed = 'consumer_resumed',
ConsumerClosed = 'consumer_closed',

RestartIce = 'restart_ice',

CreatePeer = 'create_peer',
PeerAdded = 'peer_added',
PeerLeft = 'peer_left',
ClosePeer = 'close_peer',

Mute = 'mute',
Expand Down
4 changes: 2 additions & 2 deletions src/types/index.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { types as mediasoupTypes } from 'mediasoup';
import { MessageResponse } from '../protos/gen/mediaSignalingPackage/MessageResponse';

export type ProducerSource = 'mic' | 'camera' | 'screen' | 'screenAudio';

Expand All @@ -10,6 +9,7 @@ export type AckCallback<T = { [key: string]: unknown }> = (res: {
response?: T;
}) => void;
export type PeerType = 'Recorder' | 'Participant';
export type ResponseData = { [key: string]: unknown };

export enum Role {
Moderator = 'Moderator',
Expand Down Expand Up @@ -167,7 +167,7 @@ export enum ConnectionState {
export type AppDataWithRouterId = mediasoupTypes.AppData & { routerId: string };

export interface PendingRequest {
resolve: (response: MessageResponse) => void;
resolve: (response: ResponseData) => void;
reject: (error: Error) => void;
}

Expand Down
3 changes: 2 additions & 1 deletion tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
"outDir": "./dist",
"rootDir": "./src",
"forceConsistentCasingInFileNames": true,
"isolatedModules": true
"isolatedModules": true,
"strict": true
},
"include": ["src/**/*.ts"],
"exclude": ["node_modules", "dist", "tests", "eslint.config.mts"]
Expand Down