@observertc/observer-js 0.30.1-beta → 0.30.3-beta

package/lib/models/Models.js

@@ -1,10 +1,10 @@
 "use strict";
-// @generated by protoc-gen-es v1.1.1 with parameter "target=ts"
+// @generated by protoc-gen-es v1.7.2 with parameter "target=ts"
 // @generated from file models.proto (package org.observertc.observer.models, syntax proto2)
 /* eslint-disable */
 // @ts-nocheck
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SfuSctpChannel = exports.SfuOutboundRtpPad = exports.SfuInboundRtpPad = exports.SfuTransport = exports.Sfu = exports.OutboundTrack = exports.InboundTrack = exports.InboundTrackStats = exports.InboundTrackVideoStats = exports.PeerConnection = exports.Client = exports.ClientCoordinate = exports.Call = void 0;
+exports.SfuSctpChannel = exports.SfuOutboundRtpPad = exports.SfuInboundRtpPad = exports.SfuTransport = exports.Sfu = exports.OutboundTrack = exports.InboundTrack = exports.InboundTrackStats = exports.InboundTrackVideoStats = exports.PeerConnection = exports.Client = exports.Call = void 0;
 const protobuf_1 = require("@bufbuild/protobuf");
 const samples_pb_1 = require("./samples_pb");
 /**
@@ -42,34 +42,6 @@ Call.fields = protobuf_1.proto2.util.newFieldList(() => [
     { no: 4, name: "started", kind: "scalar", T: 4 /* ScalarType.UINT64 */ },
     { no: 5, name: "clientIds", kind: "scalar", T: 9 /* ScalarType.STRING */, repeated: true },
 ]);
-/**
- * @generated from message org.observertc.observer.models.ClientCoordinate
- */
-class ClientCoordinate extends protobuf_1.Message {
-    constructor(data) {
-        super();
-        protobuf_1.proto2.util.initPartial(data, this);
-    }
-    static fromBinary(bytes, options) {
-        return new ClientCoordinate().fromBinary(bytes, options);
-    }
-    static fromJson(jsonValue, options) {
-        return new ClientCoordinate().fromJson(jsonValue, options);
-    }
-    static fromJsonString(jsonString, options) {
-        return new ClientCoordinate().fromJsonString(jsonString, options);
-    }
-    static equals(a, b) {
-        return protobuf_1.proto2.util.equals(ClientCoordinate, a, b);
-    }
-}
-exports.ClientCoordinate = ClientCoordinate;
-ClientCoordinate.runtime = protobuf_1.proto2;
-ClientCoordinate.typeName = "org.observertc.observer.models.ClientCoordinate";
-ClientCoordinate.fields = protobuf_1.proto2.util.newFieldList(() => [
-    { no: 1, name: "latitude", kind: "scalar", T: 2 /* ScalarType.FLOAT */ },
-    { no: 2, name: "longitude", kind: "scalar", T: 2 /* ScalarType.FLOAT */ },
-]);
 /**
  * @generated from message org.observertc.observer.models.Client
  */
@@ -114,7 +86,6 @@ Client.fields = protobuf_1.proto2.util.newFieldList(() => [
     { no: 13, name: "operationSystem", kind: "message", T: samples_pb_1.Samples_ClientSample_OperationSystem, opt: true },
     { no: 14, name: "platform", kind: "message", T: samples_pb_1.Samples_ClientSample_Platform, opt: true },
     { no: 15, name: "engine", kind: "message", T: samples_pb_1.Samples_ClientSample_Engine, opt: true },
-    { no: 16, name: "coordinates", kind: "message", T: ClientCoordinate, opt: true },
 ]);
 /**
  * @generated from message org.observertc.observer.models.PeerConnection
@@ -130,22 +101,6 @@ class PeerConnection extends protobuf_1.Message {
          * @generated from field: repeated string outboundTrackIds = 12;
          */
         this.outboundTrackIds = [];
-        /**
-         * @generated from field: repeated org.observertc.schemas.protobuf.Samples.ClientSample.IceLocalCandidate icelocalCandidates = 13;
-         */
-        this.icelocalCandidates = [];
-        /**
-         * @generated from field: repeated org.observertc.schemas.protobuf.Samples.ClientSample.IceRemoteCandidate iceRemoteCandidates = 14;
-         */
-        this.iceRemoteCandidates = [];
-        /**
-         * @generated from field: repeated org.observertc.schemas.protobuf.Samples.ClientSample.IceCandidatePair iceCandidatePairs = 15;
-         */
-        this.iceCandidatePairs = [];
-        /**
-         * @generated from field: repeated org.observertc.schemas.protobuf.Samples.ClientSample.PeerConnectionTransport transports = 16;
-         */
-        this.transports = [];
         protobuf_1.proto2.util.initPartial(data, this);
     }
     static fromBinary(bytes, options) {
@@ -177,10 +132,6 @@ PeerConnection.fields = protobuf_1.proto2.util.newFieldList(() => [
     { no: 10, name: "label", kind: "scalar", T: 9 /* ScalarType.STRING */, opt: true },
     { no: 11, name: "inboundTrackIds", kind: "scalar", T: 9 /* ScalarType.STRING */, repeated: true },
     { no: 12, name: "outboundTrackIds", kind: "scalar", T: 9 /* ScalarType.STRING */, repeated: true },
-    { no: 13, name: "icelocalCandidates", kind: "message", T: samples_pb_1.Samples_ClientSample_IceLocalCandidate, repeated: true },
-    { no: 14, name: "iceRemoteCandidates", kind: "message", T: samples_pb_1.Samples_ClientSample_IceRemoteCandidate, repeated: true },
-    { no: 15, name: "iceCandidatePairs", kind: "message", T: samples_pb_1.Samples_ClientSample_IceCandidatePair, repeated: true },
-    { no: 16, name: "transports", kind: "message", T: samples_pb_1.Samples_ClientSample_PeerConnectionTransport, repeated: true },
     { no: 17, name: "touched", kind: "scalar", T: 4 /* ScalarType.UINT64 */, opt: true },
 ]);
 /**
@@ -210,7 +161,6 @@ InboundTrackVideoStats.typeName = "org.observertc.observer.models.InboundTrackVi
 InboundTrackVideoStats.fields = protobuf_1.proto2.util.newFieldList(() => [
     { no: 1, name: "ssrc", kind: "scalar", T: 5 /* ScalarType.INT32 */ },
     { no: 2, name: "fps", kind: "scalar", T: 2 /* ScalarType.FLOAT */, opt: true },
-    { no: 4, name: "sample", kind: "message", T: samples_pb_1.Samples_ClientSample_InboundVideoTrack, opt: true },
 ]);
 /**
  * @generated from message org.observertc.observer.models.InboundTrackStats
@@ -251,14 +201,6 @@ class InboundTrack extends protobuf_1.Message {
          * @generated from field: repeated int64 ssrc = 14;
          */
         this.ssrc = [];
-        /**
-         * @generated from field: repeated org.observertc.schemas.protobuf.Samples.ClientSample.InboundAudioTrack audioStats = 15;
-         */
-        this.audioStats = [];
-        /**
-         * @generated from field: repeated org.observertc.schemas.protobuf.Samples.ClientSample.InboundVideoTrack videoStats = 16;
-         */
-        this.videoStats = [];
         protobuf_1.proto2.util.initPartial(data, this);
     }
     static fromBinary(bytes, options) {
@@ -292,8 +234,6 @@ InboundTrack.fields = protobuf_1.proto2.util.newFieldList(() => [
     { no: 12, name: "sfuSinkId", kind: "scalar", T: 9 /* ScalarType.STRING */, opt: true },
     { no: 13, name: "sfuStreamId", kind: "scalar", T: 9 /* ScalarType.STRING */, opt: true },
     { no: 14, name: "ssrc", kind: "scalar", T: 3 /* ScalarType.INT64 */, repeated: true },
-    { no: 15, name: "audioStats", kind: "message", T: samples_pb_1.Samples_ClientSample_InboundAudioTrack, repeated: true },
-    { no: 16, name: "videoStats", kind: "message", T: samples_pb_1.Samples_ClientSample_InboundVideoTrack, repeated: true },
     { no: 17, name: "touched", kind: "scalar", T: 4 /* ScalarType.UINT64 */, opt: true },
 ]);
 /**
@@ -306,14 +246,6 @@ class OutboundTrack extends protobuf_1.Message {
          * @generated from field: repeated int64 ssrc = 13;
          */
         this.ssrc = [];
-        /**
-         * @generated from field: repeated org.observertc.schemas.protobuf.Samples.ClientSample.OutboundAudioTrack audioStats = 14;
-         */
-        this.audioStats = [];
-        /**
-         * @generated from field: repeated org.observertc.schemas.protobuf.Samples.ClientSample.OutboundVideoTrack videoStats = 15;
-         */
-        this.videoStats = [];
         protobuf_1.proto2.util.initPartial(data, this);
     }
     static fromBinary(bytes, options) {
@@ -346,8 +278,6 @@ OutboundTrack.fields = protobuf_1.proto2.util.newFieldList(() => [
     { no: 11, name: "marker", kind: "scalar", T: 9 /* ScalarType.STRING */, opt: true },
     { no: 12, name: "sfuStreamId", kind: "scalar", T: 9 /* ScalarType.STRING */, opt: true },
     { no: 13, name: "ssrc", kind: "scalar", T: 3 /* ScalarType.INT64 */, repeated: true },
-    { no: 14, name: "audioStats", kind: "message", T: samples_pb_1.Samples_ClientSample_OutboundAudioTrack, repeated: true },
-    { no: 15, name: "videoStats", kind: "message", T: samples_pb_1.Samples_ClientSample_OutboundVideoTrack, repeated: true },
     { no: 16, name: "touched", kind: "scalar", T: 4 /* ScalarType.UINT64 */, opt: true },
 ]);
 /**

package/lib/models/samples_pb.js

@@ -1,5 +1,5 @@
 "use strict";
-// @generated by protoc-gen-es v1.1.1 with parameter "target=ts"
+// @generated by protoc-gen-es v1.7.2 with parameter "target=ts"
 // @generated from file samples.proto (package org.observertc.schemas.protobuf, syntax proto2)
 /* eslint-disable */
 // @ts-nocheck

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@observertc/observer-js",
-  "version": "0.30.1-beta",
+  "version": "0.30.3-beta",
   "description": "Server Side NodeJS Library for processing ObserveRTC Samples",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",

package/src/ObservedClient.ts

@@ -1,4 +1,4 @@
-import { ClientSample, IceLocalCandidate } from '@observertc/sample-schemas-js';
+import { ClientSample } from '@observertc/sample-schemas-js';
 import { ObservedCall } from './ObservedCall';
 import * as Models from './models/Models';
 import { StorageProvider } from './storages/StorageProvider';
@@ -9,9 +9,9 @@ import { createLogger } from './common/logger';
 import { CallMetaType, createCallMetaReport } from './common/callMetaReports';
 // eslint-disable-next-line camelcase
 import { Samples_ClientSample_Browser, Samples_ClientSample_Engine, Samples_ClientSample_OperationSystem, Samples_ClientSample_Platform } from './models/samples_pb';
-import { IceCandidatePairReport } from '@observertc/report-schemas-js';
 import { isValidUuid } from './common/utils';
 import { createClientJoinedEventReport, createClientLeftEventReport } from './common/callEventReports';
+import { CallEventType } from './common/CallEventType';
 
 const logger = createLogger('ObservedClient');
 
@@ -33,7 +33,6 @@ export type ObservedClientEvents = {
 	update: [],
 	close: [],
 	'processing-sample-overflow': [],
-	'candidate-pair-change': [],
 	newpeerconnection: [ObservedPeerConnection],
 };
 
@@ -89,6 +88,8 @@ export class ObservedClient<AppData extends Record<string, unknown> = Record<str
 		return result;
 	}
 
+	public created = Date.now();
+
 	private readonly _peerConnections = new Map<string, ObservedPeerConnection>();
 	private readonly _execute = createSingleExecutor();
 	
@@ -97,15 +98,28 @@ export class ObservedClient<AppData extends Record<string, unknown> = Record<str
 	private _updated = Date.now();
 	private _acceptedSample = 0;
 	private _processingSample = 0;
-	private _selectedLocalIceCandidate?: IceLocalCandidate;
-	private _selectedRemoteIceCandidate?: IceLocalCandidate;
 	private _timeZoneOffsetInHours?: number;
 	private _leaveReported = false;
 
+	public totalInboundPacketsLost = 0;
+	public totalInboundPacketsReceived = 0;
+	public totalOutboundPacketsSent = 0;
+	public totalDataChannelBytesSent = 0;
+	public totalDataChannelBytesReceived = 0;
+	public totalSentBytes = 0;
+	public totalReceivedBytes = 0;
+
+	public avgRttInS?: number;
+	public sendingBitrate?: number;
+	public receivingBitrate?: number;
+
 	public readonly mediaDevices: string[] = [];
 	public readonly codecs: string[] = [];
 	public readonly userMediaErrors: string[] = [];
 
+	public readonly ωpendingCreatedTracksTimestamp = new Map<string, number>();
+	public readonly ωpendingCreatedPeerConnectionTimestamp = new Map<string, number>();
+
 	private constructor(
 		private readonly _model: Models.Client,
 		public readonly call: ObservedCall,
@@ -153,14 +167,6 @@ export class ObservedClient<AppData extends Record<string, unknown> = Record<str
 		return this._model.userId;
 	}
 
-	public get selectedLocalIceCandidate() {
-		return this._selectedLocalIceCandidate;
-	}
-
-	public get selectedRemoteIceCandidate() {
-		return this._selectedRemoteIceCandidate;
-	}
-
 	public get timeZoneOffsetInHours() {
 		return this._timeZoneOffsetInHours;
 	}
@@ -193,6 +199,10 @@ export class ObservedClient<AppData extends Record<string, unknown> = Record<str
 		return this._updated;
 	}
 
+	public get uptimeInMs() {
+		return this._updated - this.created;
+	}
+
 	public get closed() {
 		return this._closed;
 	}
@@ -225,6 +235,11 @@ export class ObservedClient<AppData extends Record<string, unknown> = Record<str
 		}
 
 		return this._execute(async () => {
+			for (const peerConnection of this._peerConnections.values()) {
+				if (peerConnection.closed) continue;
+				peerConnection.resetMetrics();
+			}
+
 			let executeSave = false;
 
 			if (this.userId !== sample.userId) {
@@ -379,9 +394,47 @@ export class ObservedClient<AppData extends Record<string, unknown> = Record<str
 				});
 			}
 
-			for (const { timestamp = Date.now(), ...callEvent } of sample.customCallEvents ?? []) {
-				if (callEvent.name === 'CLIENT_LEFT') this._leaveReported = true;
+			for (const { timestamp, ...callEvent } of sample.customCallEvents ?? []) {
+				const peerConnection = this._peerConnections.get(callEvent.peerConnectionId ?? '');
 				
+				switch (callEvent.name) {
+					case CallEventType.CLIENT_JOINED:
+						this.created = timestamp ?? this.created;
+						break;
+					case CallEventType.CLIENT_LEFT:
+						this._leaveReported = true;
+						break;
+					case CallEventType.ICE_CONNECTION_STATE_CHANGED: 
+						peerConnection && callEvent.value && peerConnection.emit('iceconnectionstatechange', callEvent.value);
+						break;
+					case CallEventType.ICE_GATHERING_STATE_CHANGED:
+						peerConnection && callEvent.value && peerConnection.emit('icegatheringstatechange', callEvent.value);
+						break;
+					case CallEventType.PEER_CONNECTION_STATE_CHANGED:
+						peerConnection && callEvent.value && peerConnection.emit('connectionstatechange', callEvent.value);
+						break;
+					case CallEventType.PEER_CONNECTION_OPENED: {
+						if (!callEvent.peerConnectionId) break;
+						if (peerConnection) {
+							peerConnection.created = timestamp ?? peerConnection.created;
+						} else {
+							this.ωpendingCreatedPeerConnectionTimestamp.set(callEvent.peerConnectionId, timestamp ?? Date.now());
+						}
+						break;
+					}
+					case CallEventType.MEDIA_TRACK_ADDED: {
+						if (!callEvent.mediaTrackId) break;
+						const track = peerConnection?.getTrack(callEvent.mediaTrackId);
+
+						if (track) {
+							track.created = timestamp ?? track.created;
+						} else {
+							this.ωpendingCreatedTracksTimestamp.set(callEvent.mediaTrackId, timestamp ?? Date.now());
+						}
+					}
+
+				}
+
 				this.reports.addCallEventReport({
 					serviceId: this.serviceId,
 					mediaUnitId: this.mediaUnitId,
@@ -389,7 +442,7 @@ export class ObservedClient<AppData extends Record<string, unknown> = Record<str
 					callId: this.callId,
 					clientId: this.clientId,
 					userId: this.userId,
-					timestamp,
+					timestamp: timestamp ?? Date.now(),
 					...callEvent,
 				});
 			}
@@ -480,76 +533,6 @@ export class ObservedClient<AppData extends Record<string, unknown> = Record<str
 
 				this.reports.addCallMetaReport(callMetaReport);
 			}
-			let selectedLocalCandidateId: string | undefined;
-			let selectedRemoteCandidateId: string | undefined;
-
-			for (const candidatePair of sample.iceCandidatePairs ?? []) {
-				if (candidatePair.nominated) {
-					if (!selectedLocalCandidateId) selectedLocalCandidateId = candidatePair.localCandidateId;
-					if (!selectedRemoteCandidateId) selectedRemoteCandidateId = candidatePair.remoteCandidateId;
-				}
-
-				const report: IceCandidatePairReport = {
-					serviceId: this.serviceId,
-					mediaUnitId: this.mediaUnitId,
-					roomId: this.roomId,
-					callId: this.callId,
-					clientId: this.clientId,
-					userId: this.userId,
-					timestamp: sample.timestamp,
-					...candidatePair,
-					sampleSeq: -1, // deprecated
-				};
-		
-				this.reports.addIceCandidatePairReport(report);
-				
-			}
-	
-			let changeIceCandidatePair = false;
-
-			for (const iceLocalCandidate of sample.iceLocalCandidates ?? []) {
-				if (
-					iceLocalCandidate.id && selectedLocalCandidateId &&
-					iceLocalCandidate.id === selectedLocalCandidateId && 
-					this._selectedLocalIceCandidate?.id !== iceLocalCandidate.id
-				) {
-					this._selectedLocalIceCandidate = iceLocalCandidate;
-					changeIceCandidatePair = true;
-				}
-				const callMetaReport = createCallMetaReport(
-					this.serviceId, 
-					this.mediaUnitId, 
-					this.roomId, 
-					this.callId, 
-					this.clientId, {
-						type: CallMetaType.ICE_LOCAL_CANDIDATE,
-						payload: iceLocalCandidate,
-					}, this.userId);
-
-				this.reports.addCallMetaReport(callMetaReport);
-			}
-	
-			for (const iceRemoteCandidate of sample.iceRemoteCandidates ?? []) {
-				if (
-					iceRemoteCandidate.id && selectedRemoteCandidateId &&
-					iceRemoteCandidate.id === selectedRemoteCandidateId && 
-					this._selectedRemoteIceCandidate?.id !== iceRemoteCandidate.id
-				) {
-					this._selectedRemoteIceCandidate = iceRemoteCandidate;
-					changeIceCandidatePair = true;
-				}
-				const callMetaReport = createCallMetaReport(
-					this.serviceId, 
-					this.mediaUnitId, 
-					this.roomId, 
-					this.callId, 
-					this.clientId, {
-						type: CallMetaType.ICE_REMOTE_CANDIDATE,
-						payload: iceRemoteCandidate,
-					}, this.userId);
-
-				this.reports.addCallMetaReport(callMetaReport);
-			}
 
 			for (const transport of sample.pcTransports ?? []) {
 				try {
@@ -676,6 +659,48 @@ export class ObservedClient<AppData extends Record<string, unknown> = Record<str
 				}
 			}
 
+			for (const iceLocalCandidate of sample.iceLocalCandidates ?? []) {
+				if (!iceLocalCandidate.peerConnectionId) {
+					logger.warn(`Local ice candidate without peerConnectionId: ${JSON.stringify(iceLocalCandidate)}`);
+					continue;
+				}
+				const peerConnection = this._peerConnections.get(iceLocalCandidate.peerConnectionId);
+
+				if (!peerConnection) {
+					logger.debug(`Peer connection ${iceLocalCandidate.peerConnectionId} not found for ice local candidate ${iceLocalCandidate.id}`);
+					continue;
+				}
+
+				peerConnection.ICE.addLocalCandidate(iceLocalCandidate);
+			}
+	
+			for (const iceRemoteCandidate of sample.iceRemoteCandidates ?? []) {
+				if (!iceRemoteCandidate.peerConnectionId) {
+					logger.warn(`Remote ice candidate without peerConnectionId: ${JSON.stringify(iceRemoteCandidate)}`);
+					continue;
+				}
+				const peerConnection = this._peerConnections.get(iceRemoteCandidate.peerConnectionId);
+
+				if (!peerConnection) {
+					logger.debug(`Peer connection ${iceRemoteCandidate.peerConnectionId} not found for ice remote candidate ${iceRemoteCandidate.id}`);
+					continue;
+				}
+
+				peerConnection.ICE.addRemoteCandidate(iceRemoteCandidate);
+			}
+
+			for (const candidatePair of sample.iceCandidatePairs ?? []) {
+				const peerConnection = this._peerConnections.get(candidatePair.peerConnectionId);
+
+				if (!peerConnection) {
+					logger.debug(`Peer connection ${candidatePair.peerConnectionId} not found for ice candidate pair ${candidatePair.localCandidateId}, ${candidatePair.remoteCandidateId}`);
+
+					continue;
+				}
+
+				peerConnection.ICE.update(candidatePair, sample.timestamp);
+			}
+
 			// close entries that are idle for too long
 			if (this.call.observer.config.maxEntryIdleTimeInMs && this._updated < sample.timestamp) {
 
@@ -706,10 +731,35 @@ export class ObservedClient<AppData extends Record<string, unknown> = Record<str
 					}
 				}
 			}
-			
-			if (changeIceCandidatePair) {
-				this.emit('candidate-pair-change');
+
+			// update metrics
+			this.totalSentBytes = 0;
+			this.totalReceivedBytes = 0;
+			this.totalOutboundPacketsSent = 0;
+			this.totalInboundPacketsReceived = 0;
+			this.totalInboundPacketsLost = 0;
+			this.totalDataChannelBytesSent = 0;
+			this.totalDataChannelBytesReceived = 0;
+			this.sendingBitrate = 0;
+			this.receivingBitrate = 0;
+			let sumRttInS = 0;
+
+			for (const peerConnection of this._peerConnections.values()) {
+				if (peerConnection.closed) continue;
+				peerConnection.updateMetrics();
+				this.totalSentBytes += peerConnection.totalSentAudioBytes + peerConnection.totalSentVideoBytes;
+				this.totalReceivedBytes += peerConnection.totalReceivedAudioBytes + peerConnection.totalReceivedVideoBytes;
+				this.totalOutboundPacketsSent += peerConnection.totalOutboundPacketsSent;
+				this.totalInboundPacketsReceived += peerConnection.totalInboundPacketsReceived;
+				this.totalInboundPacketsLost += peerConnection.totalInboundPacketsLost;
+				this.totalDataChannelBytesSent += peerConnection.totalDataChannelBytesSent;
+				this.totalDataChannelBytesReceived += peerConnection.totalDataChannelBytesReceived;
+				this.sendingBitrate += peerConnection.sendingAudioBitrate + peerConnection.sendingVideoBitrate;
+				this.receivingBitrate += peerConnection.receivingAudioBitrate + peerConnection.receivingVideoBitrate;
+				sumRttInS += peerConnection.avgRttInS ?? 0;
 			}
+
+			this.avgRttInS = this._peerConnections.size ? sumRttInS / this._peerConnections.size : -1;
 			
 			if (executeSave) await this._save();
 
@@ -725,6 +775,13 @@ export class ObservedClient<AppData extends Record<string, unknown> = Record<str
 			peerConnectionId,
 		}, this, this._storageProvider);
 
+		const pendingTracksTimestamp = this.ωpendingCreatedTracksTimestamp.get(peerConnectionId);
+
+		if (pendingTracksTimestamp) {
+			result.created = pendingTracksTimestamp;
+			this.ωpendingCreatedTracksTimestamp.delete(peerConnectionId);
+		}
+
 		result.once('close', () => {
 			this._peerConnections.delete(peerConnectionId);
 			this._model.peerConnectionIds = this._model.peerConnectionIds.filter((id) => id !== peerConnectionId);

package/src/ObservedICE.ts

@@ -0,0 +1,176 @@
+import { IceCandidatePair, IceLocalCandidate, IceRemoteCandidate } from '@observertc/sample-schemas-js';
+import { EventEmitter } from 'events';
+import { ObservedPeerConnection } from './ObservedPeerConnection';
+import { IceCandidatePairReport } from '@observertc/report-schemas-js';
+import { CallMetaType, createCallMetaReport } from './common/callMetaReports';
+
+export type ObservedICEEvents = {
+	update: [],
+	'new-local-candidate': [IceLocalCandidate],
+	'new-remote-candidate': [IceRemoteCandidate],
+	'new-selected-candidate-pair': [{
+		localCandidate: IceLocalCandidate,
+		remoteCandidate: IceRemoteCandidate,
+	}],
+	close: [],
+};
+
+export declare interface ObservedICE {
+	on<U extends keyof ObservedICEEvents>(event: U, listener: (...args: ObservedICEEvents[U]) => void): this;
+	off<U extends keyof ObservedICEEvents>(event: U, listener: (...args: ObservedICEEvents[U]) => void): this;
+	once<U extends keyof ObservedICEEvents>(event: U, listener: (...args: ObservedICEEvents[U]) => void): this;
+	emit<U extends keyof ObservedICEEvents>(event: U, ...args: ObservedICEEvents[U]): boolean;
+}
+
+export class ObservedICE extends EventEmitter {
+	public static create(peerConnection: ObservedPeerConnection,) {
+		return new ObservedICE(peerConnection);
+	}
+
+	private readonly _localCandidates = new Map<string, IceLocalCandidate>();
+	private readonly _remoteCandidates = new Map<string, IceLocalCandidate>();
+	
+	private _selectedLocalCandidateId?: string;
+	private _selectedRemoteCandidateId?: string;
+	private _updated = Date.now();
+	private _stats?: IceCandidatePair;
+	private _closed = false;
+    
+	private constructor(
+		public readonly peerConnection: ObservedPeerConnection,
+	) {
+		super();
+	}
+
+	public get reports() {
+		return this.peerConnection.reports;
+	}
+
+	public get localCandidates(): ReadonlyMap<string, IceLocalCandidate> {
+		return this._localCandidates;
+	}
+
+	public get remoteCandidates(): ReadonlyMap<string, IceRemoteCandidate> {
+		return this._remoteCandidates;
+	}
+
+	public get selectedLocalCandidate() {
+		return this._localCandidates.get(this._selectedLocalCandidateId ?? '');
+	}
+
+	public get selectedRemoteCandidate() {
+		return this._remoteCandidates.get(this._selectedRemoteCandidateId ?? '');
+	}
+
+	public get stats() {
+		return this._stats;
+	}
+
+	public get updated() {
+		return this._updated;
+	}
+
+	public get closed() {
+		return this._closed;
+	}
+
+	public close() {
+		if (this._closed) return;
+		this._closed = true;
+		this.emit('close');
+	}
+
+	public addLocalCandidate(candidate: IceLocalCandidate) {
+		if (!candidate.id) return;
+
+		const newCandidate = !this._localCandidates.has(candidate.id);
+
+		this._localCandidates.set(candidate.id, candidate);
+
+		if (newCandidate) {
+			const callMetaReport = createCallMetaReport(
+				this.peerConnection.client.serviceId, 
+				this.peerConnection.client.mediaUnitId, 
+				this.peerConnection.client.roomId, 
+				this.peerConnection.client.callId, 
+				this.peerConnection.client.clientId, {
+					type: CallMetaType.ICE_LOCAL_CANDIDATE,
+					payload: candidate,
+				}, this.peerConnection.client.userId);
+
+			this.reports.addCallMetaReport(callMetaReport);
+
+			this.emit('new-local-candidate', candidate);
+		}
+	}
+
+	public addRemoteCandidate(candidate: IceRemoteCandidate) {
+		if (!candidate.id) return;
+
+		const newCandidate = !this._remoteCandidates.has(candidate.id);
+
+		this._remoteCandidates.set(candidate.id, candidate);
+
+		if (newCandidate) {
+			const callMetaReport = createCallMetaReport(
+				this.peerConnection.client.serviceId, 
+				this.peerConnection.client.mediaUnitId, 
+				this.peerConnection.client.roomId, 
+				this.peerConnection.client.callId, 
+				this.peerConnection.client.clientId, {
+					type: CallMetaType.ICE_REMOTE_CANDIDATE,
+					payload: candidate,
+				}, this.peerConnection.client.userId);
+
+			this.reports.addCallMetaReport(callMetaReport);
+            
+			this.emit('new-remote-candidate', candidate);
+		}
+	}
+
+	public update(candidatePair: IceCandidatePair, timestamp: number) {
+
+		const report: IceCandidatePairReport = {
+			serviceId: this.peerConnection.client.serviceId,
+			mediaUnitId: this.peerConnection.client.mediaUnitId,
+			roomId: this.peerConnection.client.roomId,
+			callId: this.peerConnection.client.callId,
+			clientId: this.peerConnection.client.clientId,
+			userId: this.peerConnection.client.userId,
+			timestamp,
+			...candidatePair,
+			sampleSeq: -1, // deprecated
+		};
+
+		this.reports.addIceCandidatePairReport(report);
+
+		if (!candidatePair.nominated) return;
+
+		this._stats = candidatePair;
+
+		if (
+			candidatePair.localCandidateId && 
+            candidatePair.localCandidateId !== this._selectedLocalCandidateId && 
+            this._localCandidates.has(candidatePair.localCandidateId) &&
+            candidatePair.remoteCandidateId &&
+            candidatePair.remoteCandidateId !== this._selectedRemoteCandidateId &&
+            this._remoteCandidates.has(candidatePair.remoteCandidateId)
+		) {
+			this._selectedLocalCandidateId = candidatePair.localCandidateId;
+			this._selectedRemoteCandidateId = candidatePair.remoteCandidateId;
+
+			const localCandidate = this._localCandidates.get(candidatePair.localCandidateId);
+			const remoteCandidate = this._remoteCandidates.get(candidatePair.remoteCandidateId);
+
+			if (localCandidate && remoteCandidate) {
+				this.emit('new-selected-candidate-pair', {
+					localCandidate,
+					remoteCandidate,
+				});
+			}
+		}
+
+		this._updated = timestamp;
+		this.emit('update');
+	}
+}