@observertc/observer-js 0.40.14 → 0.40.16

package/lib/monitors/CallSummary.d.ts

@@ -1,4 +1,4 @@
-export interface ClientIssue {
+export interface ClientIssue extends Record<string, unknown> {
     severity: 'critical' | 'major' | 'minor';
     timestamp: number;
     description?: string;
@@ -6,7 +6,7 @@ export interface ClientIssue {
     trackId?: string;
     attachments?: Record<string, unknown>;
 }
-export interface ClientSummary {
+export interface ClientSummary extends Record<string, unknown> {
     clientId: string;
     mediaUnitId: string;
     userId?: string;
@@ -21,7 +21,7 @@ export interface ClientSummary {
     usedTurn: boolean;
     issues: ClientIssue[];
 }
-export interface CallSummary {
+export interface CallSummary extends Record<string, unknown> {
     serviceId: string;
     roomId: string;
     callId: string;

package/lib/monitors/CallSummary.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CallSummary.d.ts","sourceRoot":"","sources":["../../src/monitors/CallSummary.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,WAAW;IAC3B,QAAQ,EAAE,UAAU,GAAG,OAAO,GAAG,OAAO,CAAC;IACzC,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACtC;AAED,MAAM,WAAW,aAAa;IAC7B,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,YAAY,EAAE,MAAM,CAAC;IACrB,uBAAuB,EAAE,MAAM,CAAC;IAChC,uBAAuB,EAAE,MAAM,CAAC;IAChC,sBAAsB,EAAE,MAAM,CAAC;IAC/B,sBAAsB,EAAE,MAAM,CAAC;IAC/B,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,OAAO,CAAC;IAClB,MAAM,EAAE,WAAW,EAAE,CAAC;CACtB;AAED,MAAM,WAAW,WAAW;IAC3B,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,EAAE,MAAM,CAAC;IACrB,uBAAuB,EAAE,MAAM,CAAC;IAChC,cAAc,EAAE,MAAM,CAAC;IACvB,eAAe,CAAC,EAAE,WAAW,CAAC,UAAU,CAAC,CAAC;IAC1C,OAAO,EAAE,aAAa,EAAE,CAAC;CACzB"}
+{"version":3,"file":"CallSummary.d.ts","sourceRoot":"","sources":["../../src/monitors/CallSummary.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,WAAY,SAAQ,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IAC3D,QAAQ,EAAE,UAAU,GAAG,OAAO,GAAG,OAAO,CAAC;IACzC,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACtC;AAED,MAAM,WAAW,aAAc,SAAQ,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IAC7D,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,YAAY,EAAE,MAAM,CAAC;IACrB,uBAAuB,EAAE,MAAM,CAAC;IAChC,uBAAuB,EAAE,MAAM,CAAC;IAChC,sBAAsB,EAAE,MAAM,CAAC;IAC/B,sBAAsB,EAAE,MAAM,CAAC;IAC/B,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,OAAO,CAAC;IAClB,MAAM,EAAE,WAAW,EAAE,CAAC;CACtB;AAED,MAAM,WAAW,WAAY,SAAQ,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IAC3D,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,EAAE,MAAM,CAAC;IACrB,uBAAuB,EAAE,MAAM,CAAC;IAChC,cAAc,EAAE,MAAM,CAAC;IACvB,eAAe,CAAC,EAAE,WAAW,CAAC,UAAU,CAAC,CAAC;IAC1C,OAAO,EAAE,aAAa,EAAE,CAAC;CACzB"}

package/lib/monitors/TurnUsageMonitor.d.ts

@@ -16,6 +16,15 @@ export type TurnUsage = {
     totalPacketsSent: number;
     totalPacketsReceived: number;
 };
+export type TurnStats = {
+    turnIp: string;
+    totalBytesSent: number;
+    totalBytesReceived: number;
+    totalPacketsSent: number;
+    totalPacketsReceived: number;
+    deltaBytesSent: number;
+    deltaBytesReceived: number;
+};
 export declare interface TurnUsageMonitor {
     on<U extends keyof TurnUsageMonitorEvents>(event: U, listener: (...args: TurnUsageMonitorEvents[U]) => void): this;
     off<U extends keyof TurnUsageMonitorEvents>(event: U, listener: (...args: TurnUsageMonitorEvents[U]) => void): this;
@@ -25,8 +34,10 @@ export declare interface TurnUsageMonitor {
 export declare class TurnUsageMonitor extends EventEmitter {
     private readonly _connections;
     private readonly _turnUsage;
+    private readonly _stats;
     private _closed;
     constructor();
+    getStats(): TurnStats[];
     addPeerConnection(peerConnection: ObservedPeerConnection): void;
     removePeerConnection(peerConnection: ObservedPeerConnection): void;
     get turnIps(): string[];

package/lib/monitors/TurnUsageMonitor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TurnUsageMonitor.d.ts","sourceRoot":"","sources":["../../src/monitors/TurnUsageMonitor.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAC;AAEnE,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAEnD,MAAM,MAAM,sBAAsB,GAAG;IACpC,KAAK,EAAE,EAAE,CAAC;IACV,WAAW,EAAE,CAAC,MAAM,CAAC,CAAC;IACtB,MAAM,EAAE,CAAC,SAAS,CAAC,CAAC;IACpB,iBAAiB,EAAE,CAAC,sBAAsB,CAAC,CAAC;IAC5C,oBAAoB,EAAE,CAAC,sBAAsB,CAAC,CAAC;CAC/C,CAAA;AAED,MAAM,MAAM,SAAS,GAAG;IACvB,MAAM,EAAE,MAAM,CAAC;IACf,cAAc,EAAE,MAAM,CAAC;IACvB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,gBAAgB,EAAE,MAAM,CAAC;IACzB,oBAAoB,EAAE,MAAM,CAAC;CAC7B,CAAA;AAQD,MAAM,CAAC,OAAO,WAAW,gBAAgB;IACxC,EAAE,CAAC,CAAC,SAAS,MAAM,sBAAsB,EAAE,KAAK,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,GAAG,IAAI,EAAE,sBAAsB,CAAC,CAAC,CAAC,KAAK,IAAI,GAAG,IAAI,CAAC;IACnH,GAAG,CAAC,CAAC,SAAS,MAAM,sBAAsB,EAAE,KAAK,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,GAAG,IAAI,EAAE,sBAAsB,CAAC,CAAC,CAAC,KAAK,IAAI,GAAG,IAAI,CAAC;IACpH,IAAI,CAAC,CAAC,SAAS,MAAM,sBAAsB,EAAE,KAAK,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,GAAG,IAAI,EAAE,sBAAsB,CAAC,CAAC,CAAC,KAAK,IAAI,GAAG,IAAI,CAAC;IACrH,IAAI,CAAC,CAAC,SAAS,MAAM,sBAAsB,EAAE,KAAK,EAAE,CAAC,EAAE,GAAG,IAAI,EAAE,sBAAsB,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC;CACpG;AAED,qBAAa,gBAAiB,SAAQ,YAAY;IACjD,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAyC;IACtE,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAgC;IAE3D,OAAO,CAAC,OAAO,CAAS;;IAKjB,iBAAiB,CAAC,cAAc,EAAE,sBAAsB;IA4CxD,oBAAoB,CAAC,cAAc,EAAE,sBAAsB;IAelE,IAAW,OAAO,aAEjB;IAED,IAAW,eAAe,6BAEzB;IAEM,QAAQ,CAAC,MAAM,EAAE,MAAM;IAI9B,IAAW,OAAO,IAAI,WAAW,CAAC,MAAM,EAAE,cAAc,CAAC,CAUxD;IAED,IAAW,MAAM,YAEhB;IAEM,KAAK;CAMZ"}
+{"version":3,"file":"TurnUsageMonitor.d.ts","sourceRoot":"","sources":["../../src/monitors/TurnUsageMonitor.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAC;AAEnE,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAEnD,MAAM,MAAM,sBAAsB,GAAG;IACpC,KAAK,EAAE,EAAE,CAAC;IACV,WAAW,EAAE,CAAC,MAAM,CAAC,CAAC;IACtB,MAAM,EAAE,CAAC,SAAS,CAAC,CAAC;IACpB,iBAAiB,EAAE,CAAC,sBAAsB,CAAC,CAAC;IAC5C,oBAAoB,EAAE,CAAC,sBAAsB,CAAC,CAAC;CAC/C,CAAA;AAED,MAAM,MAAM,SAAS,GAAG;IACvB,MAAM,EAAE,MAAM,CAAC;IACf,cAAc,EAAE,MAAM,CAAC;IACvB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,gBAAgB,EAAE,MAAM,CAAC;IACzB,oBAAoB,EAAE,MAAM,CAAC;CAC7B,CAAA;AAED,MAAM,MAAM,SAAS,GAAG;IACvB,MAAM,EAAE,MAAM,CAAC;IACf,cAAc,EAAE,MAAM,CAAC;IACvB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,gBAAgB,EAAE,MAAM,CAAC;IACzB,oBAAoB,EAAE,MAAM,CAAC;IAC7B,cAAc,EAAE,MAAM,CAAC;IACvB,kBAAkB,EAAE,MAAM,CAAC;CAC3B,CAAA;AAQD,MAAM,CAAC,OAAO,WAAW,gBAAgB;IACxC,EAAE,CAAC,CAAC,SAAS,MAAM,sBAAsB,EAAE,KAAK,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,GAAG,IAAI,EAAE,sBAAsB,CAAC,CAAC,CAAC,KAAK,IAAI,GAAG,IAAI,CAAC;IACnH,GAAG,CAAC,CAAC,SAAS,MAAM,sBAAsB,EAAE,KAAK,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,GAAG,IAAI,EAAE,sBAAsB,CAAC,CAAC,CAAC,KAAK,IAAI,GAAG,IAAI,CAAC;IACpH,IAAI,CAAC,CAAC,SAAS,MAAM,sBAAsB,EAAE,KAAK,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,GAAG,IAAI,EAAE,sBAAsB,CAAC,CAAC,CAAC,KAAK,IAAI,GAAG,IAAI,CAAC;IACrH,IAAI,CAAC,CAAC,SAAS,MAAM,sBAAsB,EAAE,KAAK,EAAE,CAAC,EAAE,GAAG,IAAI,EAAE,sBAAsB,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC;CACpG;AAED,qBAAa,gBAAiB,SAAQ,YAAY;IACjD,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAyC;IACtE,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAgC;IAC3D,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAgC;IAEvD,OAAO,CAAC,OAAO,CAAS;;IAKjB,QAAQ,IAAI,SAAS,EAAE;IA6BvB,iBAAiB,CAAC,cAAc,EAAE,sBAAsB;IA4CxD,oBAAoB,CAAC,cAAc,EAAE,sBAAsB;IAelE,IAAW,OAAO,aAEjB;IAED,IAAW,eAAe,6BAEzB;IAEM,QAAQ,CAAC,MAAM,EAAE,MAAM;IAI9B,IAAW,OAAO,IAAI,WAAW,CAAC,MAAM,EAAE,cAAc,CAAC,CAUxD;IAED,IAAW,MAAM,YAEhB;IAEM,KAAK;CAMZ"}

package/lib/monitors/TurnUsageMonitor.js

@@ -7,8 +7,33 @@ class TurnUsageMonitor extends events_1.EventEmitter {
         super();
         this._connections = new Map();
         this._turnUsage = new Map();
+        this._stats = new Map();
         this._closed = false;
     }
+    getStats() {
+        var _a;
+        const result = [];
+        for (const [turnIp, usage] of this._turnUsage) {
+            const stats = (_a = this._stats.get(turnIp)) !== null && _a !== void 0 ? _a : {
+                turnIp,
+                totalBytesSent: 0,
+                totalBytesReceived: 0,
+                totalPacketsSent: 0,
+                totalPacketsReceived: 0,
+                deltaBytesSent: 0,
+                deltaBytesReceived: 0,
+            };
+            stats.deltaBytesSent = usage.totalBytesSent - stats.totalBytesSent;
+            stats.deltaBytesReceived = usage.totalBytesReceived - stats.totalBytesReceived;
+            stats.totalBytesSent = usage.totalBytesSent;
+            stats.totalBytesReceived = usage.totalBytesReceived;
+            stats.totalPacketsSent = usage.totalPacketsSent;
+            stats.totalPacketsReceived = usage.totalPacketsReceived;
+            this._stats.set(turnIp, stats);
+            result.push(stats);
+        }
+        return result;
+    }
     addPeerConnection(peerConnection) {
         if (this.closed)
             return;

package/package.json

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

package/src/monitors/CallSummary.ts

@@ -1,4 +1,4 @@
-export interface ClientIssue {
+export interface ClientIssue extends Record<string, unknown> {
 	severity: 'critical' | 'major' | 'minor';
 	timestamp: number;
 	description?: string;
@@ -7,7 +7,7 @@ export interface ClientIssue {
 	attachments?: Record<string, unknown>,
 }
 
-export interface ClientSummary {
+export interface ClientSummary extends Record<string, unknown> {
 	clientId: string;
 	mediaUnitId: string;
 	userId?: string;
@@ -23,7 +23,7 @@ export interface ClientSummary {
 	issues: ClientIssue[];
 }
 
-export interface CallSummary {
+export interface CallSummary extends Record<string, unknown> {
 	serviceId: string;
 	roomId: string;
 	callId: string;

package/src/monitors/TurnUsageMonitor.ts

@@ -19,6 +19,16 @@ export type TurnUsage = {
 	totalPacketsReceived: number;
 }
 
+export type TurnStats = {
+	turnIp: string;
+	totalBytesSent: number;
+	totalBytesReceived: number;
+	totalPacketsSent: number;
+	totalPacketsReceived: number;
+	deltaBytesSent: number;
+	deltaBytesReceived: number;
+}
+
 type ObservedConnection = {
 	peerConnection: ObservedPeerConnection,
 	onUpdate: (...e: ObservedICEEvents['update']) => void;
@@ -35,12 +45,42 @@ export declare interface TurnUsageMonitor {
 export class TurnUsageMonitor extends EventEmitter {
 	private readonly _connections = new Map<string, ObservedConnection>();
 	private readonly _turnUsage = new Map<string, TurnUsage>();
+	private readonly _stats = new Map<string, TurnStats>();
 
 	private _closed = false;
 	public constructor() {
 		super();
 	}
 
+	public getStats(): TurnStats[] {
+		const result: TurnStats[] = [];
+
+		for (const [ turnIp, usage ] of this._turnUsage) {
+			const stats = this._stats.get(turnIp) ?? {
+				turnIp,
+				totalBytesSent: 0,
+				totalBytesReceived: 0,
+				totalPacketsSent: 0,
+				totalPacketsReceived: 0,
+				deltaBytesSent: 0,
+				deltaBytesReceived: 0,
+			};
+
+			stats.deltaBytesSent = usage.totalBytesSent - stats.totalBytesSent;
+			stats.deltaBytesReceived = usage.totalBytesReceived - stats.totalBytesReceived;
+			stats.totalBytesSent = usage.totalBytesSent;
+			stats.totalBytesReceived = usage.totalBytesReceived;
+			stats.totalPacketsSent = usage.totalPacketsSent;
+			stats.totalPacketsReceived = usage.totalPacketsReceived;
+
+			this._stats.set(turnIp, stats);
+
+			result.push(stats);
+		}
+
+		return result;
+	}
+
 	public addPeerConnection(peerConnection: ObservedPeerConnection) {
 		if (this.closed) return;
 		if (this._connections.has(peerConnection.peerConnectionId)) return;