@observertc/observer-js 1.0.1-7be4daa.0 → 1.0.1-7f7cf82.0

package/lib/schema/ClientEventTypes.js

@@ -21,9 +21,10 @@ var ClientEventTypes;
     ClientEventTypes["DATA_CHANNEL_ERROR"] = "DATA_CHANNEL_ERROR";
     ClientEventTypes["NEGOTIATION_NEEDED"] = "NEGOTIATION_NEEDED";
     ClientEventTypes["SIGNALING_STATE_CHANGE"] = "SIGNALING_STATE_CHANGE";
-    ClientEventTypes["ICE_GATHERING_STATE_CHANGE"] = "ICE_GATHERING_STATE_CHANGE";
-    ClientEventTypes["ICE_CONNECTION_STATE_CHANGE"] = "ICE_CONNECTION_STATE_CHANGE";
+    // ICE_GATHERING_STATE_CHANGE = 'ICE_GATHERING_STATE_CHANGE',
+    // ICE_CONNECTION_STATE_CHANGE = 'ICE_CONNECTION_STATE_CHANGE',
     ClientEventTypes["ICE_CANDIDATE"] = "ICE_CANDIDATE";
+    ClientEventTypes["ICE_CANDIDATE_ERROR"] = "ICE_CANDIDATE_ERROR";
     // mediasoup events
     ClientEventTypes["PRODUCER_ADDED"] = "PRODUCER_ADDED";
     ClientEventTypes["PRODUCER_REMOVED"] = "PRODUCER_REMOVED";
@@ -31,6 +32,8 @@ var ClientEventTypes;
     ClientEventTypes["PRODUCER_RESUMED"] = "PRODUCER_RESUMED";
     ClientEventTypes["CONSUMER_ADDED"] = "CONSUMER_ADDED";
     ClientEventTypes["CONSUMER_REMOVED"] = "CONSUMER_REMOVED";
+    ClientEventTypes["CONSUMER_PAUSED"] = "CONSUMER_PAUSED";
+    ClientEventTypes["CONSUMER_RESUMED"] = "CONSUMER_RESUMED";
     ClientEventTypes["DATA_PRODUCER_CREATED"] = "DATA_PRODUCER_CREATED";
     ClientEventTypes["DATA_PRODUCER_CLOSED"] = "DATA_PRODUCER_CLOSED";
     ClientEventTypes["DATA_CONSUMER_CREATED"] = "DATA_CONSUMER_CREATED";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@observertc/observer-js",
-  "version": "1.0.1-7be4daa.0",
+  "version": "1.0.1-7f7cf82.0",
   "description": "Server Side NodeJS Library for processing ObserveRTC Samples",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",

package/src/ObservedClient.ts

@@ -381,7 +381,7 @@ export class ObservedClient<AppData extends Record<string, unknown> = Record<str
 					} else if (postBuffer) {
 						postBuffer.push(event);
 					} else {
-						logger.warn('Received PEER_CONNECTION_OPENED event without a corresponding observedPeerConnection', event);
+						logger.warn('Received PEER_CONNECTION_OPENED event without a corresponding observedPeerConnection: %o', event);
 					}
 					
 				}
@@ -398,7 +398,7 @@ export class ObservedClient<AppData extends Record<string, unknown> = Record<str
 					} else if (postBuffer) {
 						postBuffer.push(event);
 					} else {
-						logger.warn('Received PEER_CONNECTION_CLOSED event without a corresponding observedPeerConnection', event);
+						logger.warn('Received PEER_CONNECTION_CLOSED event without a corresponding observedPeerConnection: %o', event);
 					}
 				}
 				break;
@@ -415,7 +415,7 @@ export class ObservedClient<AppData extends Record<string, unknown> = Record<str
 					} else if (postBuffer) {
 						postBuffer.push(event);
 					} else {
-						logger.warn('Received MEDIA_TRACK_ADDED event without a corresponding observedPeerConnection or observedTrack', event);
+						logger.warn('Received MEDIA_TRACK_ADDED event without a corresponding observedPeerConnection or observedTrack: %o', event);
 					}
 				}
 				break;
@@ -432,7 +432,7 @@ export class ObservedClient<AppData extends Record<string, unknown> = Record<str
 					} else if (postBuffer) {
 						postBuffer.push(event);
 					} else {
-						logger.warn('Received MEDIA_TRACK_REMOVED event without a corresponding observedPeerConnection or observedTrack', event);
+						logger.warn('Received MEDIA_TRACK_REMOVED event without a corresponding observedPeerConnection or observedTrack: %o', event);
 					}
 				}
 				break;
@@ -449,7 +449,7 @@ export class ObservedClient<AppData extends Record<string, unknown> = Record<str
 					} else if (postBuffer) {
 						postBuffer.push(event);
 					} else {
-						logger.warn('Received DATA_CHANNEL_OPENED event without a corresponding observedPeerConnection or observedDataChannel', event);
+						logger.warn('Received DATA_CHANNEL_OPENED event without a corresponding observedPeerConnection or observedDataChannel: %o', event);
 					}
 				}
 				break;
@@ -466,12 +466,119 @@ export class ObservedClient<AppData extends Record<string, unknown> = Record<str
 					} else if (postBuffer) {
 						postBuffer.push(event);
 					} else {
-						logger.warn('Received DATA_CHANNEL_CLOSE event without a corresponding observedPeerConnection or observedDataChannel', event);
+						logger.warn('Received DATA_CHANNEL_CLOSE event without a corresponding observedPeerConnection or observedDataChannel: %o', event);
+					}
+				}
+				break;
+			}
+			case ClientEventTypes.MEDIA_TRACK_MUTED: {
+				const payload = parseJsonAs<Record<string, unknown>>(event.payload);
+
+				if (payload?.peerConnectionId && typeof payload.peerConnectionId === 'string' && payload?.trackId && typeof payload.trackId === 'string') {
+					const observedPeerConnection = this.observedPeerConnections.get(payload.peerConnectionId);
+					const observedInboundTrack = observedPeerConnection?.observedInboundTracks.get(payload.trackId); 
+					const observedOutboundTrack = observedPeerConnection?.observedOutboundTracks.get(payload.trackId);
+
+					if (observedPeerConnection) {
+						if (observedInboundTrack) {
+							observedInboundTrack.muted = true;
+							observedPeerConnection?.emit('muted-inbound-track', observedInboundTrack);
+						} else if (observedOutboundTrack) {
+							observedOutboundTrack.muted = true;
+							observedPeerConnection?.emit('muted-outbound-track', observedOutboundTrack);
+						}
+					} else if (postBuffer) {
+						postBuffer.push(event);
+					} else {
+						logger.warn('Received MEDIA_TRACK_MUTED event without a corresponding observedPeerConnection or observedTrack: %o', event);
+					}
+				}
+
+				break;
+			}
+			case ClientEventTypes.MEDIA_TRACK_UNMUTED: {
+				const payload = parseJsonAs<Record<string, unknown>>(event.payload);
+
+				if (payload?.peerConnectionId && typeof payload.peerConnectionId === 'string' && payload?.trackId && typeof payload.trackId === 'string') {
+					const observedPeerConnection = this.observedPeerConnections.get(payload.peerConnectionId);
+					const observedInboundTrack = observedPeerConnection?.observedInboundTracks.get(payload.trackId); 
+					const observedOutboundTrack = observedPeerConnection?.observedOutboundTracks.get(payload.trackId);
+
+					if (observedPeerConnection) {
+						if (observedInboundTrack) {
+							observedInboundTrack.muted = false;
+							observedPeerConnection?.emit('unmuted-inbound-track', observedInboundTrack);
+						} else if (observedOutboundTrack) {
+							observedOutboundTrack.muted = false;
+							observedPeerConnection?.emit('unmuted-outbound-track', observedOutboundTrack);
+						}
+					} else if (postBuffer) {
+						postBuffer.push(event);
+					} else {
+						logger.warn('Received MEDIA_TRACK_UNMUTED event without a corresponding observedPeerConnection or observedTrack: %o', event);
+					}
+				}
+				break;
+			}
+			case ClientEventTypes.ICE_CONNECTION_STATE_CHANGED: {
+				const payload = parseJsonAs<Record<string, unknown>>(event.payload);
+
+				if (payload?.peerConnectionId && typeof payload.peerConnectionId === 'string' && payload?.iceConnectionState && typeof payload.iceConnectionState === 'string') {
+					const observedPeerConnection = this.observedPeerConnections.get(payload.peerConnectionId);
+
+					if (observedPeerConnection) {
+						observedPeerConnection.iceConnectionState = payload.iceConnectionState;
+						observedPeerConnection.emit('iceconnectionstatechange', {
+							state: payload.iceConnectionState,
+						});
+					} else if (postBuffer) {
+						postBuffer.push(event);
+					} else {
+						logger.warn('Received ICE_CONNECTION_STATE_CHANGED event without a corresponding observedPeerConnection: %o', event);
+					}
+				}
+				break;
+			}
+			case ClientEventTypes.ICE_GATHERING_STATE_CHANGED: {
+				const payload = parseJsonAs<Record<string, unknown>>(event.payload);
+
+				if (payload?.peerConnectionId && typeof payload.peerConnectionId === 'string' && payload?.iceGatheringState && typeof payload.iceGatheringState === 'string') {
+					const observedPeerConnection = this.observedPeerConnections.get(payload.peerConnectionId);
+
+					if (observedPeerConnection) {
+						observedPeerConnection.iceGatheringState = payload.iceGatheringState;
+						observedPeerConnection.emit('icegatheringstatechange', {
+							state: payload.iceGatheringState,
+						});
+					} else if (postBuffer) {
+						postBuffer.push(event);
+					} else {
+						logger.warn('Received ICE_GATHERING_STATE_CHANGED event without a corresponding observedPeerConnection: %o', event);
+					}
+				}
+				break;
+			}
+			case ClientEventTypes.PEER_CONNECTION_STATE_CHANGED: {
+				const payload = parseJsonAs<Record<string, unknown>>(event.payload);
+
+				if (payload?.peerConnectionId && typeof payload.peerConnectionId === 'string' && payload?.peerConnectionState && typeof payload.peerConnectionState === 'string') {
+					const observedPeerConnection = this.observedPeerConnections.get(payload.peerConnectionId);
+
+					if (observedPeerConnection) {
+						observedPeerConnection.connectionState = payload.peerConnectionState;
+						observedPeerConnection.emit('connectionstatechange', {
+							state: payload.peerConnectionState,
+						});
+					} else if (postBuffer) {
+						postBuffer.push(event);
+					} else {
+						logger.warn('Received PEER_CONNECTION_STATE_CHANGED event without a corresponding observedPeerConnection: %o', event);
 					}
 				}
 				break;
 			}
 		}
+		
 		this.emit('clientEvent', event);
 	}
 

package/src/ObservedInboundTrack.ts

@@ -18,6 +18,8 @@ export class ObservedInboundTrack implements InboundTrackSample {
 
 	public addedAt?: number | undefined;
 	public removedAt?: number | undefined;
+
+	public muted?: boolean;
 	
 	attachments?: Record<string, unknown> | undefined;
 

package/src/ObservedOutboundTrack.ts

@@ -18,6 +18,8 @@ export class ObservedOutboundTrack implements OutboundTrackSample {
 	public addedAt?: number | undefined;
 	public removedAt?: number | undefined;
 
+	public muted?: boolean;
+
 	attachments?: Record<string, unknown> | undefined;
 
 	constructor(

package/src/ObservedPeerConnection.ts

@@ -72,6 +72,26 @@ export type ObservedPeerConnectionEvents = {
 	'removed-peer-connection-transport': [ObservedPeerConnectionTransport];
 	'removed-remote-inbound-rtp': [ObservedRemoteInboundRtp];
 	'removed-remote-outbound-rtp': [ObservedRemoteOutboundRtp];
+	'updated-inbound-rtp': [ObservedInboundRtp];
+	'updated-outbound-rtp': [ObservedOutboundRtp];
+	'updated-inbound-track': [ObservedInboundTrack];
+	'updated-outbound-track': [ObservedOutboundTrack];
+	'updated-ice-candidate-pair': [ObservedIceCandidatePair];
+	'updated-ice-transport': [ObservedIceTransport];
+	'updated-peer-connection-transport': [ObservedPeerConnectionTransport];
+	'updated-media-source': [ObservedMediaSource];
+	'updated-media-playout': [ObservedMediaPlayout];
+	'updated-data-channel': [ObservedDataChannel];
+	'updated-ice-candidate': [ObservedIceCandidate];
+	'updated-certificate': [ObservedCertificate];
+	'updated-codec': [ObservedCodec];
+	'updated-remote-inbound-rtp': [ObservedRemoteInboundRtp];
+	'updated-remote-outbound-rtp': [ObservedRemoteOutboundRtp];
+	'muted-inbound-track': [ObservedInboundTrack];
+	'muted-outbound-track': [ObservedOutboundTrack];
+	'unmuted-inbound-track': [ObservedInboundTrack];
+	'unmuted-outbound-track': [ObservedOutboundTrack];
+
 	'update': [],
 	close: [];
 };
@@ -108,6 +128,10 @@ export class ObservedPeerConnection extends EventEmitter {
 	public closedAt?: number;
 	public updated = Date.now();
 
+	public connectionState?: string;
+	public iceConnectionState?: string;
+	public iceGatheringState?: string;
+
 	public availableIncomingBitrate = 0;
 	public availableOutgoingBitrate = 0;
 	public totalInboundPacketsLost = 0;
@@ -650,6 +674,7 @@ export class ObservedPeerConnection extends EventEmitter {
 			this.emit('added-certificate', observedCertificate);
 		} else {
 			observedCertificate.update(stats);
+			this.emit('updated-certificate', observedCertificate);
 		}
 
 		return observedCertificate;
@@ -675,6 +700,7 @@ export class ObservedPeerConnection extends EventEmitter {
 		} else {
 			observedCodec.update(stats);
 		}
+		this.emit('updated-codec', observedCodec);
 
 		return observedCodec;
 	}
@@ -699,6 +725,7 @@ export class ObservedPeerConnection extends EventEmitter {
 		} else {
 			observedDataChannel.update(stats);
 		}
+		this.emit('updated-data-channel', observedDataChannel);
 
 		return observedDataChannel;
 	}
@@ -723,6 +750,7 @@ export class ObservedPeerConnection extends EventEmitter {
 		} else {
 			observedIceCandidate.update(stats);
 		}
+		this.emit('updated-ice-candidate', observedIceCandidate);
 
 		return observedIceCandidate;
 	}
@@ -747,6 +775,7 @@ export class ObservedPeerConnection extends EventEmitter {
 		} else {
 			observedIceCandidatePair.update(stats);
 		}
+		this.emit('updated-ice-candidate-pair', observedIceCandidatePair);
 
 		return observedIceCandidatePair;
 	}
@@ -771,6 +800,7 @@ export class ObservedPeerConnection extends EventEmitter {
 		} else {
 			observedIceTransport.update(stats);
 		}
+		this.emit('updated-ice-transport', observedIceTransport);
 
 		return observedIceTransport;
 	}
@@ -802,6 +832,7 @@ export class ObservedPeerConnection extends EventEmitter {
 		} else {
 			observedInboundRtp.update(stats);
 		}
+		this.emit('updated-inbound-rtp', observedInboundRtp);
 
 		return observedInboundRtp;
 	}
@@ -837,6 +868,7 @@ export class ObservedPeerConnection extends EventEmitter {
 		} else {
 			observedInboundTrack.update(stats);
 		}
+		this.emit('updated-inbound-track', observedInboundTrack);
 
 		return observedInboundTrack;
 	}
@@ -866,6 +898,7 @@ export class ObservedPeerConnection extends EventEmitter {
 		} else {
 			observedMediaPlayout.update(stats);
 		}
+		this.emit('updated-media-playout', observedMediaPlayout);
 
 		return observedMediaPlayout;
 	}
@@ -895,6 +928,7 @@ export class ObservedPeerConnection extends EventEmitter {
 		} else {
 			observedMediaSource.update(stats);
 		}
+		this.emit('updated-media-source', observedMediaSource);
 
 		return observedMediaSource;
 	}
@@ -925,6 +959,7 @@ export class ObservedPeerConnection extends EventEmitter {
 		} else {
 			observedOutboundRtp.update(stats);
 		}
+		this.emit('updated-outbound-rtp', observedOutboundRtp);
 		
 		return observedOutboundRtp;
 	}
@@ -959,6 +994,7 @@ export class ObservedPeerConnection extends EventEmitter {
 		} else {
 			observedOutboundTrack.update(stats);
 		}
+		this.emit('updated-outbound-track', observedOutboundTrack);
 
 		return observedOutboundTrack;
 	}
@@ -983,6 +1019,7 @@ export class ObservedPeerConnection extends EventEmitter {
 		} else {
 			observedPeerConnectionTransport.update(stats);
 		}
+		this.emit('updated-peer-connection-transport', observedPeerConnectionTransport);
 
 		return observedPeerConnectionTransport;
 	}
@@ -1013,6 +1050,7 @@ export class ObservedPeerConnection extends EventEmitter {
 		} else {
 			observedRemoteInboundRtp.update(stats);
 		}
+		this.emit('updated-remote-inbound-rtp', observedRemoteInboundRtp);
 
 		return observedRemoteInboundRtp;
 	}
@@ -1043,6 +1081,7 @@ export class ObservedPeerConnection extends EventEmitter {
 		} else {
 			observedRemoteOutboundRtp.update(stats);
 		}
+		this.emit('updated-remote-outbound-rtp', observedRemoteOutboundRtp);
 
 		return observedRemoteOutboundRtp;
 	}