@observertc/observer-js 0.40.3-beta → 0.40.5-beta

package/lib/ObservedSfuTransport.d.ts

@@ -0,0 +1,54 @@
+/// <reference types="node" />
+import { EventEmitter } from 'events';
+import { SfuTransport } from '@observertc/sample-schemas-js';
+import { ObservedSfu } from './ObservedSfu';
+import { ObservedSfuInboundRtpPad, ObservedSfuInboundRtpPadModel } from './ObservedSfuInboundRtpPad';
+import { ObservedSfuOutboundRtpPad, ObservedSfuOutboundRtpPadModel } from './ObservedSfuOutboundRtpPad';
+import { ObservedSfuSctpChannel, ObservedSfuSctpChannelModel } from './ObservedSfuSctpChannel';
+export type ObservedSfuTransportModel = {
+    sfuTransportId: string;
+};
+export type ObservedSfuTransportEvents = {
+    update: [];
+    close: [];
+    newsfuoutboundrtppad: [ObservedSfuOutboundRtpPad];
+    newsfuinboundrtppad: [ObservedSfuInboundRtpPad];
+    newsfusctpchannel: [ObservedSfuSctpChannel];
+};
+export declare interface ObservedSfuTransport {
+    on<U extends keyof ObservedSfuTransportEvents>(event: U, listener: (...args: ObservedSfuTransportEvents[U]) => void): this;
+    off<U extends keyof ObservedSfuTransportEvents>(event: U, listener: (...args: ObservedSfuTransportEvents[U]) => void): this;
+    once<U extends keyof ObservedSfuTransportEvents>(event: U, listener: (...args: ObservedSfuTransportEvents[U]) => void): this;
+    emit<U extends keyof ObservedSfuTransportEvents>(event: U, ...args: ObservedSfuTransportEvents[U]): boolean;
+    update(sample: SfuTransport, timestamp: number): void;
+}
+export declare class ObservedSfuTransport extends EventEmitter {
+    private readonly _model;
+    readonly sfu: ObservedSfu;
+    readonly created: number;
+    stats?: SfuTransport;
+    private _updated;
+    private _closed;
+    private _marker?;
+    private readonly _inboundRtpPads;
+    private readonly _outboundRtpPads;
+    private readonly _sctpChannels;
+    constructor(_model: ObservedSfuTransportModel, sfu: ObservedSfu);
+    get inboundRtpPads(): ReadonlyMap<string, ObservedSfuInboundRtpPad>;
+    get outboundRtpPads(): ReadonlyMap<string, ObservedSfuOutboundRtpPad>;
+    get sctpChannels(): ReadonlyMap<string, ObservedSfuSctpChannel>;
+    get serviceId(): string;
+    get mediaUnitId(): string;
+    get sfuId(): string;
+    get sfuTransportId(): string;
+    get reports(): import("./ReportsCollector").ReportsCollector;
+    get updated(): number;
+    get marker(): string | undefined;
+    set marker(value: string | undefined);
+    get closed(): boolean;
+    close(): void;
+    createSfuOutboundRtpPad(model: ObservedSfuOutboundRtpPadModel): ObservedSfuOutboundRtpPad;
+    createSfuInboundRtpPad(model: ObservedSfuInboundRtpPadModel): ObservedSfuInboundRtpPad;
+    createSfuSctpChannel(model: ObservedSfuSctpChannelModel): ObservedSfuSctpChannel;
+}
+//# sourceMappingURL=ObservedSfuTransport.d.ts.map

package/lib/ObservedSfuTransport.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ObservedSfuTransport.d.ts","sourceRoot":"","sources":["../src/ObservedSfuTransport.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAC7D,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C,OAAO,EAAE,wBAAwB,EAAE,6BAA6B,EAAE,MAAM,4BAA4B,CAAC;AACrG,OAAO,EAAE,yBAAyB,EAAE,8BAA8B,EAAE,MAAM,6BAA6B,CAAC;AACxG,OAAO,EAAE,sBAAsB,EAAE,2BAA2B,EAAE,MAAM,0BAA0B,CAAC;AAE/F,MAAM,MAAM,yBAAyB,GAAE;IACtC,cAAc,EAAE,MAAM,CAAC;CACvB,CAAC;AAEF,MAAM,MAAM,0BAA0B,GAAG;IACxC,MAAM,EAAE,EAAE,CAAC;IACX,KAAK,EAAE,EAAE,CAAC;IACV,oBAAoB,EAAE,CAAC,yBAAyB,CAAC,CAAC;IAClD,mBAAmB,EAAE,CAAC,wBAAwB,CAAC,CAAC;IAChD,iBAAiB,EAAE,CAAC,sBAAsB,CAAC,CAAC;CAC5C,CAAC;AAEF,MAAM,CAAC,OAAO,WAAW,oBAAoB;IAC5C,EAAE,CAAC,CAAC,SAAS,MAAM,0BAA0B,EAAE,KAAK,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,GAAG,IAAI,EAAE,0BAA0B,CAAC,CAAC,CAAC,KAAK,IAAI,GAAG,IAAI,CAAC;IAC3H,GAAG,CAAC,CAAC,SAAS,MAAM,0BAA0B,EAAE,KAAK,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,GAAG,IAAI,EAAE,0BAA0B,CAAC,CAAC,CAAC,KAAK,IAAI,GAAG,IAAI,CAAC;IAC5H,IAAI,CAAC,CAAC,SAAS,MAAM,0BAA0B,EAAE,KAAK,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,GAAG,IAAI,EAAE,0BAA0B,CAAC,CAAC,CAAC,KAAK,IAAI,GAAG,IAAI,CAAC;IAC7H,IAAI,CAAC,CAAC,SAAS,MAAM,0BAA0B,EAAE,KAAK,EAAE,CAAC,EAAE,GAAG,IAAI,EAAE,0BAA0B,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC;IAE5G,MAAM,CAAC,MAAM,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;CACtD;AAED,qBAAa,oBAAqB,SAAQ,YAAY;IAapD,OAAO,CAAC,QAAQ,CAAC,MAAM;aACP,GAAG,EAAE,WAAW;IAbjC,SAAgB,OAAO,SAAc;IAE9B,KAAK,CAAC,EAAE,YAAY,CAAC;IAC5B,OAAO,CAAC,QAAQ,CAAc;IAC9B,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,OAAO,CAAC,CAAS;IAEzB,OAAO,CAAC,QAAQ,CAAC,eAAe,CAA+C;IAC/E,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAgD;IACjF,OAAO,CAAC,QAAQ,CAAC,aAAa,CAA6C;gBAGzD,MAAM,EAAE,yBAAyB,EAClC,GAAG,EAAE,WAAW;IAMjC,IAAW,cAAc,IAAI,WAAW,CAAC,MAAM,EAAE,wBAAwB,CAAC,CAEzE;IAED,IAAW,eAAe,IAAI,WAAW,CAAC,MAAM,EAAE,yBAAyB,CAAC,CAE3E;IAED,IAAW,YAAY,IAAI,WAAW,CAAC,MAAM,EAAE,sBAAsB,CAAC,CAErE;IAED,IAAW,SAAS,WAEnB;IAED,IAAW,WAAW,WAErB;IAED,IAAW,KAAK,WAEf;IAED,IAAW,cAAc,WAExB;IAED,IAAW,OAAO,kDAEjB;IAED,IAAW,OAAO,WAEjB;IAED,IAAW,MAAM,IAIQ,MAAM,GAAG,SAAS,CAF1C;IAED,IAAW,MAAM,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,EAK1C;IAED,IAAW,MAAM,YAEhB;IAEM,KAAK;IA+BL,uBAAuB,CAAC,KAAK,EAAE,8BAA8B;IAgB7D,sBAAsB,CAAC,KAAK,EAAE,6BAA6B;IAgB3D,oBAAoB,CAAC,KAAK,EAAE,2BAA2B;CAe9D"}

package/lib/ObservedSfuTransport.js

@@ -0,0 +1,116 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ObservedSfuTransport = void 0;
+const events_1 = require("events");
+const ObservedSfuInboundRtpPad_1 = require("./ObservedSfuInboundRtpPad");
+const ObservedSfuOutboundRtpPad_1 = require("./ObservedSfuOutboundRtpPad");
+const ObservedSfuSctpChannel_1 = require("./ObservedSfuSctpChannel");
+class ObservedSfuTransport extends events_1.EventEmitter {
+    constructor(_model, sfu) {
+        super();
+        this._model = _model;
+        this.sfu = sfu;
+        this.created = Date.now();
+        this._updated = Date.now();
+        this._closed = false;
+        this._inboundRtpPads = new Map();
+        this._outboundRtpPads = new Map();
+        this._sctpChannels = new Map();
+        this.setMaxListeners(Infinity);
+    }
+    get inboundRtpPads() {
+        return this._inboundRtpPads;
+    }
+    get outboundRtpPads() {
+        return this._outboundRtpPads;
+    }
+    get sctpChannels() {
+        return this._sctpChannels;
+    }
+    get serviceId() {
+        return this.sfu.serviceId;
+    }
+    get mediaUnitId() {
+        return this.sfu.mediaUnitId;
+    }
+    get sfuId() {
+        return this.sfu.sfuId;
+    }
+    get sfuTransportId() {
+        return this._model.sfuTransportId;
+    }
+    get reports() {
+        return this.sfu.reports;
+    }
+    get updated() {
+        return this._updated;
+    }
+    get marker() {
+        return this._marker;
+    }
+    set marker(value) {
+        this._marker = value;
+        this._inboundRtpPads.forEach((pad) => (pad.marker = value));
+        this._outboundRtpPads.forEach((pad) => (pad.marker = value));
+        this._sctpChannels.forEach((channel) => (channel.marker = value));
+    }
+    get closed() {
+        return this._closed;
+    }
+    close() {
+        if (this._closed)
+            return;
+        this._closed = true;
+        [...this._inboundRtpPads.values()].forEach((pad) => pad.close());
+        [...this._outboundRtpPads.values()].forEach((pad) => pad.close());
+        [...this._sctpChannels.values()].forEach((channel) => channel.close());
+        this.emit('close');
+    }
+    update(sample, timestamp) {
+        const report = Object.assign(Object.assign({ serviceId: this.serviceId, mediaUnitId: this.mediaUnitId, sfuId: this.sfuId, callId: undefined, roomId: undefined }, sample), { timestamp, marker: this.marker });
+        this.reports.addSfuTransportReport(report);
+        this.stats = sample;
+        this._updated = Date.now();
+        this.emit('update');
+    }
+    createSfuOutboundRtpPad(model) {
+        if (this._closed)
+            throw new Error('Cannot create SfuOutboundRtpPad on closed SfuTransport');
+        if (this._inboundRtpPads.has(model.sfuOutboundRtpPadId))
+            throw new Error(`SfuOutboundRtpPad with id ${model.sfuOutboundRtpPadId} already exists`);
+        const result = new ObservedSfuOutboundRtpPad_1.ObservedSfuOutboundRtpPad(model, this);
+        result.once('close', () => {
+            this._outboundRtpPads.delete(model.sfuOutboundRtpPadId);
+        });
+        this._outboundRtpPads.set(model.sfuOutboundRtpPadId, result);
+        this.emit('newsfuoutboundrtppad', result);
+        return result;
+    }
+    createSfuInboundRtpPad(model) {
+        if (this._closed)
+            throw new Error('Cannot create SfuInboundRtpPad on closed SfuTransport');
+        if (this._inboundRtpPads.has(model.sfuInboundRtpPadId))
+            throw new Error(`SfuInboundRtpPad with id ${model.sfuInboundRtpPadId} already exists`);
+        const result = new ObservedSfuInboundRtpPad_1.ObservedSfuInboundRtpPad(model, this);
+        result.once('close', () => {
+            this._inboundRtpPads.delete(model.sfuInboundRtpPadId);
+        });
+        this._inboundRtpPads.set(model.sfuInboundRtpPadId, result);
+        this.emit('newsfuinboundrtppad', result);
+        return result;
+    }
+    createSfuSctpChannel(model) {
+        if (this._closed)
+            throw new Error('Cannot create SfuSctpChannel on closed SfuTransport');
+        if (this._sctpChannels.has(model.sfuSctpChannelId))
+            throw new Error(`SfuSctpChannel with id ${model.sfuSctpChannelId} already exists`);
+        const result = new ObservedSfuSctpChannel_1.ObservedSfuSctpChannel(model, this);
+        result.once('close', () => {
+            this._sctpChannels.delete(model.sfuSctpChannelId);
+        });
+        this._sctpChannels.set(model.sfuSctpChannelId, result);
+        this.emit('newsfusctpchannel', result);
+        return result;
+    }
+}
+exports.ObservedSfuTransport = ObservedSfuTransport;

package/lib/Observer.d.ts

@@ -4,8 +4,10 @@ import { ReportsCollector } from './ReportsCollector';
 import { EventEmitter } from 'events';
 import { PartialBy } from './common/utils';
 import { ObserverSinkContext } from './common/types';
+import { ObservedSfu, ObservedSfuModel } from './ObservedSfu';
 export type ObserverEvents = {
     'newcall': [ObservedCall];
+    'newsfu': [ObservedSfu];
     'reports': [ObserverSinkContext];
     'close': [];
 };
@@ -39,13 +41,16 @@ export declare class Observer extends EventEmitter {
     static create(providedConfig: Partial<ObserverConfig>): Observer;
     readonly reports: ReportsCollector;
     private readonly _observedCalls;
+    private readonly _observedSfus;
     private _reportTimer?;
     private _closed;
     constructor(config: ObserverConfig);
     createObservedCall<T extends Record<string, unknown> = Record<string, unknown>>(config: PartialBy<ObservedCallModel, 'serviceId' | 'started'> & {
         appData: T;
     }): ObservedCall<T>;
+    createObservedSfu<AppData extends Record<string, unknown> = Record<string, unknown>>(model: ObservedSfuModel, appData: AppData): ObservedSfu<AppData>;
     get observedCalls(): ReadonlyMap<string, ObservedCall>;
+    get observedSfus(): ReadonlyMap<string, ObservedSfu>;
     get closed(): boolean;
     close(): void;
     private _emitReports;

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;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"}
+{"version":3,"file":"Observer.d.ts","sourceRoot":"","sources":["../src/Observer.ts"],"names":[],"mappings":"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"}

package/lib/Observer.js

@@ -17,6 +17,7 @@ const ObservedCall_1 = require("./ObservedCall");
 const ReportsCollector_1 = require("./ReportsCollector");
 const events_1 = require("events");
 const callEventReports_1 = require("./common/callEventReports");
+const ObservedSfu_1 = require("./ObservedSfu");
 const logger = (0, logger_1.createLogger)('Observer');
 class Observer extends events_1.EventEmitter {
     static create(providedConfig) {
@@ -37,6 +38,7 @@ class Observer extends events_1.EventEmitter {
         this.config = config;
         this.reports = new ReportsCollector_1.ReportsCollector();
         this._observedCalls = new Map();
+        this._observedSfus = new Map();
         this._closed = false;
         this.setMaxListeners(Infinity);
         logger.debug('Observer is created with config', this.config);
@@ -75,9 +77,28 @@ class Observer extends events_1.EventEmitter {
         this.emit('newcall', call);
         return call;
     }
+    createObservedSfu(model, appData) {
+        if (this._closed) {
+            throw new Error('Attempted to create an sfu source on a closed observer');
+        }
+        const sfu = new ObservedSfu_1.ObservedSfu(model, this, appData);
+        if (this._closed)
+            throw new Error('Cannot create an observed sfu on a closed observer');
+        if (this._observedSfus.has(sfu.sfuId))
+            throw new Error(`Observed SFU with id ${sfu.sfuId} already exists`);
+        sfu.once('close', () => {
+            this._observedSfus.delete(sfu.sfuId);
+        });
+        this._observedSfus.set(sfu.sfuId, sfu);
+        this.emit('newsfu', sfu);
+        return sfu;
+    }
     get observedCalls() {
         return this._observedCalls;
     }
+    get observedSfus() {
+        return this._observedSfus;
+    }
     get closed() {
         return this._closed;
     }

package/package.json

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

package/src/CallSummary.ts

@@ -2,14 +2,7 @@ export interface ClientSummary {
 	clientId: string;
 	userId: string;
 	joined: number;
-	left: number;
-}
-
-export interface DetectedIssues {
-	clientId: string,
-	issue: string,
-	started: number,
-	ended: number,
+	durationInMs: number;
 }
 
 export interface CallSummary {
@@ -17,7 +10,6 @@ export interface CallSummary {
 	roomId: string;
 	callId: string;
 	started: number;
-	ended: number;
+	durationInMs: number;
 	clients: ClientSummary[];
-	detectedIssues: DetectedIssues[];
 }

package/src/ObservedCall.ts

@@ -25,11 +25,14 @@ export declare interface ObservedCall {
 }
 
 export class ObservedCall<AppData extends Record<string, unknown> = Record<string, unknown>> extends EventEmitter {
+	public readonly created = Date.now();
+
 	private readonly _clients = new Map<string, ObservedClient>();
 	
 	public readonly sfuStreamIdToOutboundAudioTrack = new Map<string | number, ObservedOutboundTrack<'audio'>>();
 	public readonly sfuStreamIdToOutboundVideoTrack = new Map<string | number, ObservedOutboundTrack<'video'>>();
 	private _closed = false;
+	private _updated = Date.now();
 	private _ended?: number;
 
 	public constructor(
@@ -92,10 +95,16 @@ export class ObservedCall<AppData extends Record<string, unknown> = Record<strin
 		const { appData, generateClientJoinedReport, joined = Date.now(), ...model } = config;
 		
 		const result = new ObservedClient(model, this, appData);
+		const onUpdate = () => {
+			this._updated = Date.now();
+			this.emit('update');
+		};
 
 		result.once('close', () => {
+			result.off('update', onUpdate);
 			this._clients.delete(result.clientId);
 		});
+		result.on('update', onUpdate);
 		this._clients.set(result.clientId, result);
 
 		if (generateClientJoinedReport) {

package/src/ObservedClient.ts

@@ -8,6 +8,7 @@ import { CallMetaType, createCallMetaReport } from './common/callMetaReports';
 import { isValidUuid } from './common/utils';
 import { createClientLeftEventReport } from './common/callEventReports';
 import { CallEventType } from './common/CallEventType';
+import { ObservedSfu } from './ObservedSfu';
 
 const logger = createLogger('ObservedClient');
 
@@ -58,7 +59,8 @@ export class ObservedClient<AppData extends Record<string, unknown> = Record<str
 	
 	public readonly created = Date.now();
 	public _updated = Date.now();
-
+	public sfuId?: string;
+	
 	private readonly _peerConnections = new Map<string, ObservedPeerConnection>();
 	
 	private _closed = false;
@@ -77,10 +79,26 @@ export class ObservedClient<AppData extends Record<string, unknown> = Record<str
 	public totalDataChannelBytesReceived = 0;
 	public totalSentBytes = 0;
 	public totalReceivedBytes = 0;
+	public totalReceivedAudioBytes = 0;
+	public totalReceivedVideoBytes = 0;
+	public totalSentAudioBytes = 0;
+	public totalSentVideoBytes = 0;
+
+	public deltaReceivedAudioBytes = 0;
+	public deltaReceivedVideoBytes = 0;
+	public deltaSentAudioBytes = 0;
+	public deltaSentVideoBytes = 0;
+	public deltaDataChannelBytesSent = 0;
+	public deltaDataChannelBytesReceived = 0;
+	public deltaInboundPacketsLost = 0;
+	public deltaInboundPacketsReceived = 0;
+	public deltaOutboundPacketsSent = 0;
 
 	public avgRttInMs?: number;
-	public sendingBitrate?: number;
-	public receivingBitrate?: number;
+	public outboundAudioBitrate?: number;
+	public outboundVideoBitrate?: number;
+	public inboundAudioBitrate?: number;
+	public inboundVideoBitrate?: number;
 
 	public readonly mediaDevices: string[] = [];
 	public readonly codecs: string[] = [];
@@ -98,6 +116,12 @@ export class ObservedClient<AppData extends Record<string, unknown> = Record<str
 		this.setMaxListeners(Infinity);
 	}
 
+	public get sfu(): ObservedSfu | undefined {
+		if (!this.sfuId) return;
+		
+		return this.call.observer.observedSfus.get(this.sfuId);
+	}
+
 	public get clientId(): string {
 		// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
 		return this._model.clientId!;
@@ -203,6 +227,7 @@ export class ObservedClient<AppData extends Record<string, unknown> = Record<str
 		}
 		if (this._model.marker !== sample.marker) {
 			this._model.marker = sample.marker;
+			this._peerConnections.forEach((peerConnection) => (peerConnection.marker = sample.marker));
 		}
 
 		if (this._timeZoneOffsetInHours !== sample.timeZoneOffsetInHours) {
@@ -668,40 +693,65 @@ export class ObservedClient<AppData extends Record<string, unknown> = Record<str
 
 		// update metrics
 		const wasUsingTURN = this.usingTURN;
+		const elapsedTimeInMs = now - this._updated;
 
 		this.usingTURN = false;
 		this.availableIncomingBitrate = 0;
 		this.availableOutgoingBitrate = 0;
-		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;
+		this.deltaInboundPacketsLost = 0;
+		this.deltaInboundPacketsReceived = 0;
+		this.deltaOutboundPacketsSent = 0;
+		this.deltaReceivedAudioBytes = 0;
+		this.deltaReceivedVideoBytes = 0;
+		this.deltaSentAudioBytes = 0;
+		this.deltaSentVideoBytes = 0;
+		this.deltaDataChannelBytesReceived = 0;
+		this.deltaDataChannelBytesSent = 0;
+		
+		this.outboundAudioBitrate = 0;
+		this.outboundVideoBitrate = 0;
+		this.inboundAudioBitrate = 0;
+		this.inboundVideoBitrate = 0;
 		let sumRttInMs = 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;
+			this.deltaInboundPacketsLost += peerConnection.deltaInboundPacketsLost;
+			this.deltaInboundPacketsReceived += peerConnection.deltaInboundPacketsReceived;
+			this.deltaOutboundPacketsSent += peerConnection.deltaOutboundPacketsSent;
+			this.deltaReceivedAudioBytes += peerConnection.deltaReceivedAudioBytes;
+			this.deltaReceivedVideoBytes += peerConnection.deltaReceivedVideoBytes;
+			this.deltaSentAudioBytes += peerConnection.deltaSentAudioBytes;
+			this.deltaSentVideoBytes += peerConnection.deltaSentVideoBytes;
+			this.deltaDataChannelBytesReceived += peerConnection.deltaDataChannelBytesReceived;
+			this.deltaDataChannelBytesSent += peerConnection.deltaDataChannelBytesSent;
+
 			this.availableIncomingBitrate += peerConnection.availableIncomingBitrate ?? 0;
 			this.availableOutgoingBitrate += peerConnection.availableOutgoingBitrate ?? 0;
+
 			sumRttInMs += peerConnection.avgRttInMs ?? 0;
 
 			if (peerConnection.usingTURN) this.usingTURN = true;
 		}
 
+		this.totalSentBytes += this.deltaSentAudioBytes + this.deltaSentVideoBytes;
+		this.totalReceivedBytes += this.deltaReceivedAudioBytes + this.deltaReceivedVideoBytes;
+		this.totalReceivedAudioBytes += this.deltaReceivedAudioBytes;
+		this.totalReceivedVideoBytes += this.deltaReceivedVideoBytes;	
+		this.totalSentAudioBytes += this.deltaSentAudioBytes;
+		this.totalSentVideoBytes += this.deltaSentVideoBytes;
+		this.totalOutboundPacketsSent += this.deltaOutboundPacketsSent;
+		this.totalInboundPacketsReceived += this.deltaInboundPacketsReceived;
+		this.totalInboundPacketsLost += this.deltaInboundPacketsLost;
+		this.totalDataChannelBytesSent += this.deltaDataChannelBytesSent;
+		this.totalDataChannelBytesReceived += this.deltaDataChannelBytesReceived;
+		
+		this.outboundAudioBitrate = (this.deltaSentAudioBytes * 8) / (Math.max(elapsedTimeInMs, 1) / 1000);
+		this.outboundVideoBitrate = (this.deltaSentVideoBytes * 8) / (Math.max(elapsedTimeInMs, 1) / 1000);
+		this.inboundAudioBitrate = (this.deltaReceivedAudioBytes * 8) / (Math.max(elapsedTimeInMs, 1) / 1000);
+		this.inboundVideoBitrate = (this.deltaReceivedVideoBytes * 8) / (Math.max(elapsedTimeInMs, 1) / 1000);
+
 		this.avgRttInMs = this._peerConnections.size ? sumRttInMs / this._peerConnections.size : undefined;
 			
 		if (wasUsingTURN !== this.usingTURN) this.emit('usingturn', this.usingTURN);

package/src/ObservedDataChannel.ts

@@ -49,6 +49,7 @@ export class ObservedDataChannel extends EventEmitter	{
 	private _closed = false;
 	private _updated = Date.now();
 	public bitrate = 0;
+	public marker?: string;
 
 	public totalReceivedMessages = 0;
 	public totalSentMessages = 0;
@@ -158,6 +159,7 @@ export class ObservedDataChannel extends EventEmitter	{
 			...sample,
 			timestamp,
 			sampleSeq: -1,
+			marker: this.marker,
 		};
 
 		this.reports.addClientDataChannelReport(report);

package/src/ObservedICE.ts

@@ -27,6 +27,8 @@ export class ObservedICE extends EventEmitter {
 		return new ObservedICE(peerConnection);
 	}
 
+	public marker?: string;
+
 	private readonly _localCandidates = new Map<string, IceLocalCandidate>();
 	private readonly _remoteCandidates = new Map<string, IceLocalCandidate>();
 	
@@ -141,6 +143,7 @@ export class ObservedICE extends EventEmitter {
 			timestamp,
 			...candidatePair,
 			sampleSeq: -1, // deprecated
+			marker: this.marker,
 		};
 
 		this.reports.addIceCandidatePairReport(report);

package/src/ObservedInboundTrack.ts

@@ -58,6 +58,7 @@ export class ObservedInboundTrack<Kind extends MediaKind> extends EventEmitter	{
 	public bitrate = 0;
 	public rttInMs?: number;
 	public fractionLoss = 0;
+	public marker?: string;
 
 	public totalLostPackets = 0;
 	public totalReceivedPackets = 0;
@@ -197,6 +198,7 @@ export class ObservedInboundTrack<Kind extends MediaKind> extends EventEmitter	{
 			remoteUserId: this.remoteOutboundTrack?.peerConnection.client.userId,
 			remoteTrackId: this.remoteOutboundTrack?.trackId,
 			remotePeerConnectionId: this.remoteOutboundTrack?.peerConnection.peerConnectionId,
+			marker: this.marker,
 		};
 
 		if (this.kind === 'audio') this.reports.addInboundAudioTrackReport(report);

package/src/ObservedOutboundTrack.ts

@@ -47,6 +47,7 @@ export class ObservedOutboundTrack<Kind extends MediaKind> extends EventEmitter
 
 	public bitrate = 0;
 	public rttInMs?: number;
+	public marker?: string;
 
 	public totalLostPackets = 0;
 	public totalSentPackets = 0;
@@ -162,6 +163,7 @@ export class ObservedOutboundTrack<Kind extends MediaKind> extends EventEmitter
 			...sample,
 			timestamp,
 			sampleSeq: -1,
+			marker: this.marker,
 		};
 
 		if (this.kind === 'audio') this.reports.addOutboundAudioTrackReport(report);
@@ -205,6 +207,7 @@ export class ObservedOutboundTrack<Kind extends MediaKind> extends EventEmitter
 		this.totalLostPackets = [ ...this._stats.values() ].reduce((acc, stat) => acc + (stat.packetsLost ?? 0), 0);
 		this.totalSentPackets = [ ...this._stats.values() ].reduce((acc, stat) => acc + (stat.packetsSent ?? 0), 0);
 		this.totalSentBytes = [ ...this._stats.values() ].reduce((acc, stat) => acc + (stat.bytesSent ?? 0), 0);
+		this.totalSentFrames = [ ...this._stats.values() ].reduce((acc, stat) => acc + (stat.deltaSentPackets ?? 0), 0);
 
 		this.deltaEncodedFrames = [ ...this._stats.values() ].reduce((acc, stat) => acc + (stat.deltaEncodedFrames ?? 0), 0);
 		this.deltaSentFrames = [ ...this._stats.values() ].reduce((acc, stat) => acc + (stat.deltaSentFrames ?? 0), 0);