@observertc/observer-js 0.40.0-beta → 0.40.2-beta

package/lib/ObservedPeerConnection.js

@@ -5,6 +5,7 @@ const events_1 = require("events");
 const ObservedInboundTrack_1 = require("./ObservedInboundTrack");
 const ObservedOutboundTrack_1 = require("./ObservedOutboundTrack");
 const ObservedICE_1 = require("./ObservedICE");
+const ObservedDataChannel_1 = require("./ObservedDataChannel");
 class ObservedPeerConnection extends events_1.EventEmitter {
     constructor(_model, client) {
         super();
@@ -48,6 +49,8 @@ class ObservedPeerConnection extends events_1.EventEmitter {
         this._inboundVideoTracks = new Map();
         this._outboundAudioTracks = new Map();
         this._outboundVideoTracks = new Map();
+        this._dataChannels = new Map();
+        this.setMaxListeners(Infinity);
     }
     get serviceId() {
         return this.client.serviceId;
@@ -107,6 +110,9 @@ class ObservedPeerConnection extends events_1.EventEmitter {
     get outboundVideoTracks() {
         return this._outboundVideoTracks;
     }
+    get dataChannels() {
+        return this._dataChannels;
+    }
     get uptimeInMs() {
         return this._updated - this.created;
     }
@@ -210,6 +216,12 @@ class ObservedPeerConnection extends events_1.EventEmitter {
             this.totalSentVideoPackets += track.totalSentPackets;
             sumRttInMs = ((_a = track.rttInMs) !== null && _a !== void 0 ? _a : 0);
         });
+        this._dataChannels.forEach((channel) => {
+            this.deltaDataChannelBytesSent += channel.deltaBytesSent;
+            this.deltaDataChannelBytesReceived += channel.deltaBytesReceived;
+            this.totalDataChannelBytesSent += channel.totalBytesSent;
+            this.totalDataChannelBytesReceived += channel.totalBytesReceived;
+        });
         const iceRttInMs = (_a = this.ICE.stats) === null || _a === void 0 ? void 0 : _a.currentRoundTripTime;
         let nrOfBelongings = this._inboundAudioTracks.size + this._inboundVideoTracks.size + this._outboundAudioTracks.size + this._outboundVideoTracks.size;
         if (iceRttInMs) {
@@ -276,5 +288,17 @@ class ObservedPeerConnection extends events_1.EventEmitter {
         this.emit('newoutboundvideotrack', result);
         return result;
     }
+    createDataChannel(channelId) {
+        if (this._closed)
+            throw new Error(`PeerConnection ${this.peerConnectionId} is closed`);
+        const result = new ObservedDataChannel_1.ObservedDataChannel({
+            channelId,
+        }, this);
+        result.on('close', () => {
+            this._dataChannels.delete(result.channelId);
+        });
+        this._dataChannels.set(result.channelId, result);
+        return result;
+    }
 }
 exports.ObservedPeerConnection = ObservedPeerConnection;

package/lib/ObservedSfu.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ObservedSfu.d.ts","sourceRoot":"","sources":["../src/ObservedSfu.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAC;AAE1D,MAAM,MAAM,gBAAgB,GAAE;IAC7B,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG;IAC/B,MAAM,EAAE,EAAE,CAAC;IACX,KAAK,EAAE,EAAE,CAAC;CACV,CAAC;AAEF,MAAM,CAAC,OAAO,WAAW,WAAW;IACnC,EAAE,CAAC,CAAC,SAAS,MAAM,iBAAiB,EAAE,KAAK,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,GAAG,IAAI,EAAE,iBAAiB,CAAC,CAAC,CAAC,KAAK,IAAI,GAAG,IAAI,CAAC;IACzG,GAAG,CAAC,CAAC,SAAS,MAAM,iBAAiB,EAAE,KAAK,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,GAAG,IAAI,EAAE,iBAAiB,CAAC,CAAC,CAAC,KAAK,IAAI,GAAG,IAAI,CAAC;IAC1G,IAAI,CAAC,CAAC,SAAS,MAAM,iBAAiB,EAAE,KAAK,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,GAAG,IAAI,EAAE,iBAAiB,CAAC,CAAC,CAAC,KAAK,IAAI,GAAG,IAAI,CAAC;IAC3G,IAAI,CAAC,CAAC,SAAS,MAAM,iBAAiB,EAAE,KAAK,EAAE,CAAC,EAAE,GAAG,IAAI,EAAE,iBAAiB,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC;CAC1F;AAED,qBAAa,WAAW,CAAC,OAAO,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAE,SAAQ,YAAY;IAO9G,OAAO,CAAC,QAAQ,CAAC,MAAM;aACP,QAAQ,EAAE,QAAQ;aAClB,OAAO,EAAE,OAAO;IARjC,SAAgB,OAAO,SAAc;IAErC,OAAO,CAAC,QAAQ,CAAc;IAC9B,OAAO,CAAC,OAAO,CAAS;gBAGN,MAAM,EAAE,gBAAgB,EACzB,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE,OAAO;IAKjC,IAAW,SAAS,WAGnB;IAED,IAAW,KAAK,WAGf;IAED,IAAW,MAAM,WAGhB;IAED,IAAW,OAAO,WAEjB;IAED,IAAW,MAAM,YAEhB;IAEM,KAAK;IAML,MAAM,CAAC,MAAM,EAAE,SAAS;CAO/B"}
+{"version":3,"file":"ObservedSfu.d.ts","sourceRoot":"","sources":["../src/ObservedSfu.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAC;AAE1D,MAAM,MAAM,gBAAgB,GAAE;IAC7B,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG;IAC/B,MAAM,EAAE,EAAE,CAAC;IACX,KAAK,EAAE,EAAE,CAAC;CACV,CAAC;AAEF,MAAM,CAAC,OAAO,WAAW,WAAW;IACnC,EAAE,CAAC,CAAC,SAAS,MAAM,iBAAiB,EAAE,KAAK,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,GAAG,IAAI,EAAE,iBAAiB,CAAC,CAAC,CAAC,KAAK,IAAI,GAAG,IAAI,CAAC;IACzG,GAAG,CAAC,CAAC,SAAS,MAAM,iBAAiB,EAAE,KAAK,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,GAAG,IAAI,EAAE,iBAAiB,CAAC,CAAC,CAAC,KAAK,IAAI,GAAG,IAAI,CAAC;IAC1G,IAAI,CAAC,CAAC,SAAS,MAAM,iBAAiB,EAAE,KAAK,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,GAAG,IAAI,EAAE,iBAAiB,CAAC,CAAC,CAAC,KAAK,IAAI,GAAG,IAAI,CAAC;IAC3G,IAAI,CAAC,CAAC,SAAS,MAAM,iBAAiB,EAAE,KAAK,EAAE,CAAC,EAAE,GAAG,IAAI,EAAE,iBAAiB,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC;CAC1F;AAED,qBAAa,WAAW,CAAC,OAAO,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAE,SAAQ,YAAY;IAO9G,OAAO,CAAC,QAAQ,CAAC,MAAM;aACP,QAAQ,EAAE,QAAQ;aAClB,OAAO,EAAE,OAAO;IARjC,SAAgB,OAAO,SAAc;IAErC,OAAO,CAAC,QAAQ,CAAc;IAC9B,OAAO,CAAC,OAAO,CAAS;gBAGN,MAAM,EAAE,gBAAgB,EACzB,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE,OAAO;IAMjC,IAAW,SAAS,WAGnB;IAED,IAAW,KAAK,WAGf;IAED,IAAW,MAAM,WAGhB;IAED,IAAW,OAAO,WAEjB;IAED,IAAW,MAAM,YAEhB;IAEM,KAAK;IAML,MAAM,CAAC,MAAM,EAAE,SAAS;CAO/B"}

package/lib/ObservedSfu.js

@@ -11,6 +11,7 @@ class ObservedSfu extends events_1.EventEmitter {
         this.created = Date.now();
         this._updated = Date.now();
         this._closed = false;
+        this.setMaxListeners(Infinity);
     }
     get serviceId() {
         // eslint-disable-next-line @typescript-eslint/no-non-null-assertion

package/lib/Observer.d.ts

@@ -3,8 +3,10 @@ import { ObservedCall, ObservedCallModel } from './ObservedCall';
 import { ReportsCollector } from './ReportsCollector';
 import { EventEmitter } from 'events';
 import { PartialBy } from './common/utils';
+import { ObserverSinkContext } from './common/types';
 export type ObserverEvents = {
     'newcall': [ObservedCall];
+    'reports': [ObserverSinkContext];
     'close': [];
 };
 export type ObserverConfig = {

package/lib/Observer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Observer.d.ts","sourceRoot":"","sources":["../src/Observer.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,YAAY,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AACjE,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAK3C,MAAM,MAAM,cAAc,GAAG;IAC5B,SAAS,EAAE,CAAC,YAAY,CAAC,CAAC;IAE1B,OAAO,EAAE,EAAE,CAAC;CACZ,CAAA;AAED,MAAM,MAAM,cAAc,GAAG;IAE5B;;;;;;OAMG;IACH,gBAAgB,EAAE,MAAM,CAAC;IAEzB;;;;OAIG;IACH,kBAAkB,EAAE,MAAM,CAAC;IAE3B,UAAU,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAChC,qBAAqB,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAE3C,oBAAoB,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CAC1C,CAAC;AAEF,MAAM,CAAC,OAAO,WAAW,QAAQ;IAChC,EAAE,CAAC,CAAC,SAAS,MAAM,cAAc,EAAE,KAAK,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,GAAG,IAAI,EAAE,cAAc,CAAC,CAAC,CAAC,KAAK,IAAI,GAAG,IAAI,CAAC;IACnG,GAAG,CAAC,CAAC,SAAS,MAAM,cAAc,EAAE,KAAK,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,GAAG,IAAI,EAAE,cAAc,CAAC,CAAC,CAAC,KAAK,IAAI,GAAG,IAAI,CAAC;IACpG,IAAI,CAAC,CAAC,SAAS,MAAM,cAAc,EAAE,KAAK,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,GAAG,IAAI,EAAE,cAAc,CAAC,CAAC,CAAC,KAAK,IAAI,GAAG,IAAI,CAAC;IACrG,IAAI,CAAC,CAAC,SAAS,MAAM,cAAc,EAAE,KAAK,EAAE,CAAC,EAAE,GAAG,IAAI,EAAE,cAAc,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC;CACpF;AAED,qBAAa,QAAS,SAAQ,YAAY;aAwBxB,MAAM,EAAE,cAAc;WAvBzB,MAAM,CAAC,cAAc,EAAE,OAAO,CAAC,cAAc,CAAC,GAAG,QAAQ;IAkBvE,SAAgB,OAAO,mBAA0B;IACjD,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAmC;IAClE,OAAO,CAAC,YAAY,CAAC,CAAgC;IACrD,OAAO,CAAC,OAAO,CAAS;gBAEP,MAAM,EAAE,cAAc;IAiBhC,kBAAkB,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACpF,MAAM,EAAE,SAAS,CAAC,iBAAiB,EAAE,WAAW,GAAG,SAAS,CAAC,GAAG;QAAE,OAAO,EAAE,CAAC,CAAA;KAAE,GAC5E,YAAY,CAAC,CAAC,CAAC;IAsClB,IAAW,aAAa,IAAI,WAAW,CAAC,MAAM,EAAE,YAAY,CAAC,CAE5D;IAED,IAAW,MAAM,YAEhB;IAEM,KAAK;IASZ,OAAO,CAAC,YAAY;CAepB"}
+{"version":3,"file":"Observer.d.ts","sourceRoot":"","sources":["../src/Observer.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,YAAY,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AACjE,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAE3C,OAAO,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AAIrD,MAAM,MAAM,cAAc,GAAG;IAC5B,SAAS,EAAE,CAAC,YAAY,CAAC,CAAC;IAE1B,SAAS,EAAE,CAAC,mBAAmB,CAAC,CAAC;IACjC,OAAO,EAAE,EAAE,CAAC;CACZ,CAAA;AAED,MAAM,MAAM,cAAc,GAAG;IAE5B;;;;;;OAMG;IACH,gBAAgB,EAAE,MAAM,CAAC;IAEzB;;;;OAIG;IACH,kBAAkB,EAAE,MAAM,CAAC;IAE3B,UAAU,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAChC,qBAAqB,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAE3C,oBAAoB,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CAC1C,CAAC;AAEF,MAAM,CAAC,OAAO,WAAW,QAAQ;IAChC,EAAE,CAAC,CAAC,SAAS,MAAM,cAAc,EAAE,KAAK,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,GAAG,IAAI,EAAE,cAAc,CAAC,CAAC,CAAC,KAAK,IAAI,GAAG,IAAI,CAAC;IACnG,GAAG,CAAC,CAAC,SAAS,MAAM,cAAc,EAAE,KAAK,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,GAAG,IAAI,EAAE,cAAc,CAAC,CAAC,CAAC,KAAK,IAAI,GAAG,IAAI,CAAC;IACpG,IAAI,CAAC,CAAC,SAAS,MAAM,cAAc,EAAE,KAAK,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,GAAG,IAAI,EAAE,cAAc,CAAC,CAAC,CAAC,KAAK,IAAI,GAAG,IAAI,CAAC;IACrG,IAAI,CAAC,CAAC,SAAS,MAAM,cAAc,EAAE,KAAK,EAAE,CAAC,EAAE,GAAG,IAAI,EAAE,cAAc,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC;CACpF;AAED,qBAAa,QAAS,SAAQ,YAAY;aAwBxB,MAAM,EAAE,cAAc;WAvBzB,MAAM,CAAC,cAAc,EAAE,OAAO,CAAC,cAAc,CAAC,GAAG,QAAQ;IAkBvE,SAAgB,OAAO,mBAA0B;IACjD,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAmC;IAClE,OAAO,CAAC,YAAY,CAAC,CAAgC;IACrD,OAAO,CAAC,OAAO,CAAS;gBAEP,MAAM,EAAE,cAAc;IAyBhC,kBAAkB,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACpF,MAAM,EAAE,SAAS,CAAC,iBAAiB,EAAE,WAAW,GAAG,SAAS,CAAC,GAAG;QAAE,OAAO,EAAE,CAAC,CAAA;KAAE,GAC5E,YAAY,CAAC,CAAC,CAAC;IAsClB,IAAW,aAAa,IAAI,WAAW,CAAC,MAAM,EAAE,YAAY,CAAC,CAE5D;IAED,IAAW,MAAM,YAEhB;IAEM,KAAK;IAWZ,OAAO,CAAC,YAAY;CAepB"}

package/lib/Observer.js

@@ -38,7 +38,9 @@ class Observer extends events_1.EventEmitter {
         this.reports = new ReportsCollector_1.ReportsCollector();
         this._observedCalls = new Map();
         this._closed = false;
+        this.setMaxListeners(Infinity);
         logger.debug('Observer is created with config', this.config);
+        const onReports = (context) => this.emit('reports', context);
         const onNewReport = (collectedReports) => {
             if (!this.config.maxReports || this._closed)
                 return;
@@ -47,8 +49,12 @@ class Observer extends events_1.EventEmitter {
             }
         };
         this._emitReports();
-        this.once('close', () => this.reports.off('newreport', onNewReport));
+        this.once('close', () => {
+            this.reports.off('newreport', onNewReport);
+            this.reports.off('reports', onReports);
+        });
         this.reports.on('newreport', onNewReport);
+        this.reports.on('reports', onReports);
     }
     createObservedCall(config) {
         if (this._closed) {
@@ -80,6 +86,7 @@ class Observer extends events_1.EventEmitter {
             return logger.debug('Attempted to close twice');
         }
         this._closed = true;
+        this._observedCalls.forEach((call) => call.close());
         this.emit('close');
     }
     _emitReports() {

package/package.json

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

package/src/ObservedCall.ts

@@ -38,6 +38,7 @@ export class ObservedCall<AppData extends Record<string, unknown> = Record<strin
 		public readonly appData: AppData,
 	) {
 		super();
+		this.setMaxListeners(Infinity);
 	}
 
 	public get serviceId(): string {
@@ -85,10 +86,10 @@ export class ObservedCall<AppData extends Record<string, unknown> = Record<strin
 		this.emit('close');
 	}
 
-	public createClient<ClientAppData extends Record<string, unknown> = Record<string, unknown>>(config: ObservedClientModel & { appData: ClientAppData, generateClientJoinedReport?: boolean }) {
+	public createClient<ClientAppData extends Record<string, unknown> = Record<string, unknown>>(config: ObservedClientModel & { appData: ClientAppData, generateClientJoinedReport?: boolean, joined?: number }) {
 		if (this._closed) throw new Error(`Call ${this.callId} is closed`);
 
-		const { appData, generateClientJoinedReport, ...model } = config;
+		const { appData, generateClientJoinedReport, joined = Date.now(), ...model } = config;
 		
 		const result = new ObservedClient(model, this, appData);
 
@@ -104,7 +105,7 @@ export class ObservedCall<AppData extends Record<string, unknown> = Record<strin
 				this.roomId,
 				this.callId,
 				result.clientId,
-				Date.now(),
+				joined,
 				result.userId,
 				result.marker,
 			));

package/src/ObservedClient.ts

@@ -14,18 +14,12 @@ const logger = createLogger('ObservedClient');
 export type ObservedClientModel= {
 	clientId: string;
 	mediaUnitId: string;
-	overflowingProcessingThreshold?: number;
 	userId?: string,
 	marker?: string,
 	operationSystem?: OperationSystem,
 	engine?: Engine,
 	platform?: Platform,
 	browser?: Browser,
-
-	/**
-	 * before client-monitor-js 3.4.0 the client joined event was generated by the observer, this flag is to keep the compatibility with the old behavior
-	 */
-	addJoinAndDetachClientEvent?: boolean;
 };
 
 export type ObservedClientEvents = {
@@ -101,6 +95,7 @@ export class ObservedClient<AppData extends Record<string, unknown> = Record<str
 		public readonly appData: AppData
 	) {
 		super();
+		this.setMaxListeners(Infinity);
 	}
 
 	public get clientId(): string {
@@ -194,6 +189,8 @@ export class ObservedClient<AppData extends Record<string, unknown> = Record<str
 		if (sample.clientId && sample.clientId !== 'NULL' && sample.clientId !== this.clientId) {
 			throw new Error(`Sample client id (${sample.clientId}) does not match the client id of the observed client (${this.clientId})`);
 		}
+		const now = Date.now();
+
 		++this._acceptedSample;
 		
 		for (const peerConnection of this._peerConnections.values()) {
@@ -612,34 +609,60 @@ export class ObservedClient<AppData extends Record<string, unknown> = Record<str
 			peerConnection.ICE.update(candidatePair, sample.timestamp);
 		}
 
+		for (const dataChannel of sample.dataChannels ?? []) {
+			if (!dataChannel.peerConnectionId || !dataChannel.dataChannelIdentifier) {
+				logger.warn(`DataChannel without peerConnectionId or dataChannelIdentifier: ${JSON.stringify(dataChannel)}`);
+
+				continue;
+			}
+
+			try {
+				const peerConnection = this._peerConnections.get(dataChannel.peerConnectionId) ?? this._createPeerConnection(dataChannel.peerConnectionId);
+
+				if (!peerConnection) continue;
+	
+				const observedDataChannel = peerConnection.dataChannels.get(dataChannel.dataChannelIdentifier) ?? peerConnection.createDataChannel(dataChannel.dataChannelIdentifier);
+	
+				observedDataChannel.update(dataChannel, sample.timestamp);
+			} catch (err) {
+				logger.error(`Error creating data channel: ${(err as Error)?.message}`);
+			}
+		}
+
 		// close entries that are idle for too long
 		if (this.call.observer.config.maxEntryIdleTimeInMs && this._updated < sample.timestamp) {
 
 			for (const peerConnection of this._peerConnections.values()) {
-				if (this.call.observer.config.maxEntryIdleTimeInMs < sample.timestamp - peerConnection.updated) {
+				if (this.call.observer.config.maxEntryIdleTimeInMs < peerConnection.created - peerConnection.updated) {
 					logger.debug(`Closing peer connection ${peerConnection.peerConnectionId} due to inactivity`);
 					peerConnection.close();
 
 					continue;
 				}
 				for (const track of peerConnection.inboundAudioTracks.values()) {
-					if (this.call.observer.config.maxEntryIdleTimeInMs < sample.timestamp - track.updated) {
+					if (this.call.observer.config.maxEntryIdleTimeInMs < track.created - track.updated) {
 						logger.debug(`Closing inbound audio track ${track.trackId} due to inactivity`);
 						track.close();
 					}
 				}
 				for (const track of peerConnection.inboundVideoTracks.values()) {
-					if (this.call.observer.config.maxEntryIdleTimeInMs < sample.timestamp - track.updated) {
+					if (this.call.observer.config.maxEntryIdleTimeInMs < track.created - track.updated) {
 						logger.debug(`Closing inbound video track ${track.trackId} due to inactivity`);
 						track.close();
 					}
 				}
 				for (const track of peerConnection.outboundAudioTracks.values()) {
-					if (this.call.observer.config.maxEntryIdleTimeInMs < sample.timestamp - track.updated) {
+					if (this.call.observer.config.maxEntryIdleTimeInMs < track.created - track.updated) {
 						logger.debug(`Closing outbound audio track ${track.trackId} due to inactivity`);
 						track.close();
 					}
 				}
+				for (const dataChannel of peerConnection.dataChannels.values()) {
+					if (this.call.observer.config.maxEntryIdleTimeInMs < dataChannel.created - dataChannel.updated) {
+						logger.debug(`Closing DataChannel ${dataChannel.channelId} due to inactivity`);
+						dataChannel.close();
+					}
+				}
 			}
 		}
 
@@ -683,7 +706,7 @@ export class ObservedClient<AppData extends Record<string, unknown> = Record<str
 			
 		if (wasUsingTURN !== this.usingTURN) this.emit('usingturn', this.usingTURN);
 
-		this._updated = Date.now();
+		this._updated = now;
 		this.emit('update');
 	}
 

package/src/ObservedDataChannel.ts

@@ -0,0 +1,187 @@
+import { EventEmitter } from 'events';
+import { ObservedPeerConnection } from './ObservedPeerConnection';
+import { DataChannel } from '@observertc/sample-schemas-js';
+import { ClientDataChannelReport } from '@observertc/report-schemas-js';
+
+export type ObservedDataChannelState = 'connecting' | 'open' | 'closing' | 'closed';
+
+export type ObservedDataChannelModel = {
+	channelId: number;
+}
+
+export type ObservedDataChannelEvents = {
+	update: [],
+	close: [],
+};
+
+export type ObservedInboundTrackStats = {
+	ssrc: number;
+	bitrate: number;
+	fractionLost: number;
+	rttInMs?: number;
+	lostPackets?: number;
+	receivedPackets?: number;
+	receivedFrames?: number;
+	decodedFrames?: number;
+	droppedFrames?: number;
+	receivedSamples?: number;
+	silentConcealedSamples?: number;
+	fractionLoss?: number;
+};
+
+// {
+// 	[Property in keyof ObservedInboundTrackStats<K>]: ObservedInboundTrackStats<K>[Property];
+// }
+
+export declare interface ObservedDataChannel {
+	on<U extends keyof ObservedDataChannelEvents>(event: U, listener: (...args: ObservedDataChannelEvents[U]) => void): this;
+	off<U extends keyof ObservedDataChannelEvents>(event: U, listener: (...args: ObservedDataChannelEvents[U]) => void): this;
+	once<U extends keyof ObservedDataChannelEvents>(event: U, listener: (...args: ObservedDataChannelEvents[U]) => void): this;
+	emit<U extends keyof ObservedDataChannelEvents>(event: U, ...args: ObservedDataChannelEvents[U]): boolean;
+	update(sample: DataChannel, timestamp: number): void;
+}
+
+export class ObservedDataChannel extends EventEmitter	{
+	public readonly created = Date.now();
+
+	private _stats?: DataChannel;
+	
+	private _closed = false;
+	private _updated = Date.now();
+	public bitrate = 0;
+
+	public totalReceivedMessages = 0;
+	public totalSentMessages = 0;
+	public totalBytesReceived = 0;
+	public totalBytesSent = 0;
+	
+	public deltaReceivedMessages = 0;
+	public deltaSentMessages = 0;
+	public deltaBytesReceived = 0;
+	public deltaBytesSent = 0;
+
+	public constructor(
+		private readonly _model: ObservedDataChannelModel,
+		public readonly peerConnection: ObservedPeerConnection,
+	) {
+		super();
+		this.setMaxListeners(Infinity);
+	}
+
+	public get serviceId() {
+		return this.peerConnection.serviceId;
+	}
+
+	public get roomId() {
+		return this.peerConnection.roomId;
+	}
+
+	public get callId() {
+		return this.peerConnection.callId;
+	}
+
+	public get clientId() {
+		return this.peerConnection.clientId;
+	}
+
+	public get mediaUnitId() {
+		return this.peerConnection.mediaUnitId;
+	}
+
+	public get peerConnectionId() {
+		return this.peerConnection.peerConnectionId;
+	}
+
+	public get channelId() {
+		return this._model.channelId;
+	}
+
+	public get updated() {
+		return this._updated;
+	}
+
+	public get state(): ObservedDataChannelState | undefined {
+		return this._stats?.state as ObservedDataChannelState | undefined;
+	}
+
+	public get label() {
+		return this._stats?.label;
+	}
+
+	public get protocol() {
+		return this._stats?.protocol;
+	}
+
+	public get reports() {
+		return this.peerConnection.reports;
+	}
+
+	public get stats() {
+		return this._stats;
+	}
+
+	public get closed() {
+		return this._closed;
+	}
+
+	public close() {
+		if (this._closed) return;
+
+		this._closed = true;
+
+		this.emit('close');
+	}
+
+	public resetMetrics() {
+		this.bitrate = 0;
+		this.totalReceivedMessages = 0;
+		this.totalSentMessages = 0;
+		this.totalBytesReceived = 0;
+		this.totalBytesSent = 0;
+		this.deltaReceivedMessages = 0;
+		this.deltaSentMessages = 0;
+		this.deltaBytesReceived = 0;
+	}
+
+	public update(sample: DataChannel, timestamp: number) {
+		if (this._closed) return;
+		
+		const now = Date.now();
+
+		const report: ClientDataChannelReport = {
+			serviceId: this.peerConnection.client.call.serviceId,
+			roomId: this.peerConnection.client.call.roomId,
+			callId: this.peerConnection.client.call.callId,
+			clientId: this.peerConnection.client.clientId,
+			userId: this.peerConnection.client.userId,
+			mediaUnitId: this.peerConnection.client.mediaUnitId,
+			...sample,
+			timestamp,
+			sampleSeq: -1,
+		};
+
+		this.reports.addClientDataChannelReport(report);
+
+		sample.bytesReceived;
+		sample.bytesSent;
+		sample.messageReceived;
+		sample.messageSent;
+		
+		const elapsedTimeInMs = Math.max(1, now - this._updated);
+
+		this.bitrate = ((sample.bytesReceived ?? 0) - (this._stats?.bytesReceived ?? 0)) * 8 / (elapsedTimeInMs / 1000);
+		this.deltaSentMessages = (sample.messageSent ?? 0) - (this._stats?.messageSent ?? 0);
+		this.deltaReceivedMessages = (sample.messageReceived ?? 0) - (this._stats?.messageReceived ?? 0);
+		this.deltaBytesSent = (sample.bytesSent ?? 0) - (this._stats?.bytesSent ?? 0);
+		this.deltaBytesReceived = (sample.bytesReceived ?? 0) - (this._stats?.bytesReceived ?? 0);
+
+		this.totalBytesReceived = sample.bytesReceived ?? 0;
+		this.totalBytesSent = sample.bytesSent ?? 0;
+		this.totalReceivedMessages = sample.messageReceived ?? 0;
+		this.totalSentMessages = sample.messageSent ?? 0;
+
+		this._stats = sample;
+		this._updated = timestamp;
+		this.emit('update');
+	}
+}

package/src/ObservedICE.ts

@@ -40,6 +40,7 @@ export class ObservedICE extends EventEmitter {
 		public readonly peerConnection: ObservedPeerConnection,
 	) {
 		super();
+		this.setMaxListeners(Infinity);
 	}
 
 	public get reports() {
@@ -147,7 +148,7 @@ export class ObservedICE extends EventEmitter {
 		if (!candidatePair.nominated) return;
 
 		this._stats = candidatePair;
-		
+
 		if (
 			candidatePair.localCandidateId && 
             candidatePair.localCandidateId !== this._selectedLocalCandidateId && 

package/src/ObservedInboundTrack.ts

@@ -82,6 +82,7 @@ export class ObservedInboundTrack<Kind extends MediaKind> extends EventEmitter	{
 		public readonly peerConnection: ObservedPeerConnection,
 	) {
 		super();
+		this.setMaxListeners(Infinity);
 	}
 
 	public get serviceId() {
@@ -136,10 +137,6 @@ export class ObservedInboundTrack<Kind extends MediaKind> extends EventEmitter	{
 		return this.peerConnection.reports;
 	}
 
-	public get uptimeInMs() {
-		return this._updated - this.created;
-	}
-
 	public set remoteOutboundTrack(track: ObservedOutboundTrack<Kind> | undefined) {
 		if (this._closed) return;
 		if (this._remoteOutboundTrack) return;
@@ -182,7 +179,8 @@ export class ObservedInboundTrack<Kind extends MediaKind> extends EventEmitter	{
 
 	public update(sample: ObservedInboundTrackStatsUpdate<Kind>, timestamp: number) {
 		if (this._closed) return;
-
+		
+		const now = Date.now();
 		const report: InboundAudioTrackReport | InboundVideoTrackReport = {
 			serviceId: this.peerConnection.client.call.serviceId,
 			roomId: this.peerConnection.client.call.roomId,
@@ -212,7 +210,7 @@ export class ObservedInboundTrack<Kind extends MediaKind> extends EventEmitter	{
 			this._model.sfuSinkId = sample.sfuSinkId;
 		}
 
-		const elapsedTimeInMs = Math.max(1, timestamp - this._updated);
+		const elapsedTimeInMs = Math.max(1, now - this._updated);
 		const lastStat = this._stats.get(sample.ssrc);
 		const rttInMs = sample.roundTripTime ? sample.roundTripTime * 1000 : undefined;
 		const bitrate = ((sample.bytesReceived ?? 0) - (lastStat?.bytesReceived ?? 0)) * 8 / (elapsedTimeInMs / 1000);
@@ -275,7 +273,7 @@ export class ObservedInboundTrack<Kind extends MediaKind> extends EventEmitter	{
 		this.deltaSilentConcealedSamples = [ ...this._stats.values() ].reduce((acc, stat) => acc + (stat.silentConcealedSamples ?? 0), 0);
 		this.fractionLoss = 0 < this.deltaReceivedPackets && 0 < this.deltaLostPackets ? (this.deltaLostPackets / (this.deltaReceivedPackets + this.deltaLostPackets)) : 0;
 
-		this._updated = timestamp;
+		this._updated = now;
 		this.emit('update');
 	}
 }

package/src/ObservedOutboundTrack.ts

@@ -70,6 +70,7 @@ export class ObservedOutboundTrack<Kind extends MediaKind> extends EventEmitter
 		public readonly peerConnection: ObservedPeerConnection,
 	) {
 		super();
+		this.setMaxListeners(Infinity);
 	}
 
 	public get serviceId() {
@@ -124,10 +125,6 @@ export class ObservedOutboundTrack<Kind extends MediaKind> extends EventEmitter
 		return this._stats;
 	}
 
-	public get uptimeInMs() {
-		return this._updated - this.created;
-	}
-
 	public get closed() {
 		return this._closed;
 	}
@@ -152,7 +149,8 @@ export class ObservedOutboundTrack<Kind extends MediaKind> extends EventEmitter
 
 	public update(sample: ObservedOutboundTrackStatsUpdate<Kind>, timestamp: number): void {
 		if (this._closed) return;
-
+		
+		const now = Date.now();
 		const report: OutboundAudioTrackReport | OutboundVideoTrackReport = {
 			serviceId: this.peerConnection.client.serviceId,
 			roomId: this.peerConnection.client.call.roomId,
@@ -169,7 +167,7 @@ export class ObservedOutboundTrack<Kind extends MediaKind> extends EventEmitter
 		if (this.kind === 'audio') this.reports.addOutboundAudioTrackReport(report);
 		else if (this.kind === 'video') this.reports.addOutboundVideoTrackReport(report);
 
-		const elapsedTimeInMs = Math.max(1, timestamp - this._updated);
+		const elapsedTimeInMs = Math.max(1, now - this._updated);
 		const lastStat = this._stats.get(sample.ssrc);
 		const rttInMs = sample.roundTripTime ? sample.roundTripTime * 1000 : undefined;
 		const bitrate = ((sample.bytesSent ?? 0) - (lastStat?.bytesSent ?? 0)) * 8 / (elapsedTimeInMs / 1000);
@@ -228,7 +226,7 @@ export class ObservedOutboundTrack<Kind extends MediaKind> extends EventEmitter
 			else if (this.kind === 'video') this.peerConnection.client.call.sfuStreamIdToOutboundVideoTrack.set(this._model.sfuStreamId, this as ObservedOutboundTrack<'video'>);
 		}
 
-		this._updated = timestamp;
+		this._updated = now;
 		this.emit('update');
 	}
 

package/src/ObservedPeerConnection.ts

@@ -5,6 +5,7 @@ import { ObservedInboundTrack, ObservedInboundTrackModel } from './ObservedInbou
 import { ObservedOutboundTrack, ObservedOutboundTrackModel } from './ObservedOutboundTrack';
 import { PeerConnectionTransportReport } from '@observertc/report-schemas-js';
 import { ObservedICE } from './ObservedICE';
+import { ObservedDataChannel } from './ObservedDataChannel';
 
 export type ObservedPeerConnectionEvents = {
 	update: [],
@@ -77,12 +78,14 @@ export class ObservedPeerConnection extends EventEmitter {
 	private readonly _inboundVideoTracks = new Map<string, ObservedInboundTrack<'video'>>();
 	private readonly _outboundAudioTracks = new Map<string, ObservedOutboundTrack<'audio'>>();
 	private readonly _outboundVideoTracks = new Map<string, ObservedOutboundTrack<'video'>>();
+	private readonly _dataChannels = new Map<number, ObservedDataChannel>();
 	
 	public constructor(
 		private readonly _model: ObservedPeerConnectionModel,
 		public readonly client: ObservedClient,
 	) {
 		super();
+		this.setMaxListeners(Infinity);
 	}
 
 	public get serviceId() {
@@ -158,6 +161,10 @@ export class ObservedPeerConnection extends EventEmitter {
 		return this._outboundVideoTracks;
 	}
 
+	public get dataChannels(): ReadonlyMap<number, ObservedDataChannel> {
+		return this._dataChannels;
+	}
+
 	public get uptimeInMs() {
 		return this._updated - this.created;
 	}
@@ -285,6 +292,14 @@ export class ObservedPeerConnection extends EventEmitter {
 
 			sumRttInMs = (track.rttInMs ?? 0);
 		});
+
+		this._dataChannels.forEach((channel) => {
+			this.deltaDataChannelBytesSent += channel.deltaBytesSent;
+			this.deltaDataChannelBytesReceived += channel.deltaBytesReceived;
+			this.totalDataChannelBytesSent += channel.totalBytesSent;
+			this.totalDataChannelBytesReceived += channel.totalBytesReceived;
+		});
+
 		const iceRttInMs = this.ICE.stats?.currentRoundTripTime;
 		let nrOfBelongings = this._inboundAudioTracks.size + this._inboundVideoTracks.size + this._outboundAudioTracks.size + this._outboundVideoTracks.size;
 
@@ -393,4 +408,19 @@ export class ObservedPeerConnection extends EventEmitter {
 
 		return result;
 	}
+
+	public createDataChannel(channelId: number) {
+		if (this._closed) throw new Error(`PeerConnection ${this.peerConnectionId} is closed`);
+		
+		const result = new ObservedDataChannel({
+			channelId,
+		}, this);
+
+		result.on('close', () => {
+			this._dataChannels.delete(result.channelId);
+		});
+		this._dataChannels.set(result.channelId, result);
+
+		return result;
+	}
 }

package/src/ObservedSfu.ts

@@ -32,6 +32,7 @@ export class ObservedSfu<AppData extends Record<string, unknown> = Record<string
 		public readonly appData: AppData,
 	) {
 		super();
+		this.setMaxListeners(Infinity);
 	}
 
 	public get serviceId() {