@observertc/observer-js 0.9.2-beta → 0.9.4-beta

package/package.json

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

package/src/Observer.ts

@@ -176,18 +176,22 @@ export class Observer {
 		return this._sink;
 	}
 
-	public addEvaluator(process: EvaluatorProcess) {
+	public addEvaluators(...processes: EvaluatorProcess[]) {
 		if (this._closed) {
 			throw new Error(`Attempted to add an evaluator to a closed observer`);
 		}
-		this._evaluator.addProcess(process);
+		for (const process of processes) {
+			this._evaluator.addProcess(process);
+		}
 	}
 
-	public removeEvaluator(process: EvaluatorProcess) {
+	public removeEvaluators(...processes: EvaluatorProcess[]) {
 		if (this._closed) {
 			throw new Error(`Attempted to remove an evaluator from a closed observer`);
 		}
-		this._evaluator.removeProcess(process);
+		for (const process of processes) {
+			this._evaluator.removeProcess(process);
+		}
 	}
 
 	public calls(): AsyncIterableIterator<[string, Models.Call]> {

package/src/middlewares/visitors/visitPeerConnection.ts

@@ -3,6 +3,7 @@ import * as Models from '../../models/Models';
 import { ReportsCollector } from '../../common/ReportsCollector';
 import { logger } from '../VisitObservedCallsMiddleware';
 import { PeerConnectionTransportReport } from '@observertc/report-schemas-js';
+import { Samples_ClientSample_IceCandidatePair, Samples_ClientSample_IceLocalCandidate, Samples_ClientSample_IceRemoteCandidate, Samples_ClientSample_PeerConnectionTransport } from '../../models/samples_pb';
 
 export function visitPeerConnection(
 	observedPeerConnection: ObservedPeerConnection,
@@ -55,16 +56,62 @@ export function visitPeerConnection(
 	}
 
 	if (fetchSamples) {
+		storedPeerConnection.icelocalCandidates = [];
 		for (const iceLocalCandidate of observedPeerConnection.iceLocalCandidates()) {
-			// iceLocalCandidate.id
+			const {
+				priority,
+				...sample
+			} = iceLocalCandidate;
+			storedPeerConnection.icelocalCandidates.push(new Samples_ClientSample_IceLocalCandidate({
+				...sample,
+				priority: BigInt(priority ?? -1)
+			}));
 		}
 
+		storedPeerConnection.iceRemoteCandidates = [];
 		for (const iceRemoteCandidate of observedPeerConnection.iceRemoteCandidates()) {
-			// iceRemoteCandidates
+			const {
+				priority,
+				...sample
+			} = iceRemoteCandidate;
+			storedPeerConnection.iceRemoteCandidates.push(new Samples_ClientSample_IceRemoteCandidate({
+				...sample,
+				priority: BigInt(priority ?? -1)
+			}));
 		}
 
+		storedPeerConnection.iceCandidatePairs = [];
 		for (const iceCandidatePair of observedPeerConnection.iceCandidatePairs()) {
-			// iceCandidatePair
+			const {
+				bytesDiscardedOnSend,
+				bytesReceived,
+				bytesSent,
+				lastPacketReceivedTimestamp,
+				lastPacketSentTimestamp,
+				...sample
+			} = iceCandidatePair;
+			storedPeerConnection.iceCandidatePairs.push(new Samples_ClientSample_IceCandidatePair({
+				...sample,
+				bytesDiscardedOnSend: BigInt(bytesDiscardedOnSend ?? -1),
+				bytesReceived: BigInt(bytesReceived ?? -1),
+				bytesSent: BigInt(bytesSent ?? -1),
+				lastPacketReceivedTimestamp: BigInt(lastPacketReceivedTimestamp ?? -1),
+				lastPacketSentTimestamp: BigInt(lastPacketSentTimestamp ?? -1),
+			}));
+		}
+
+		storedPeerConnection.transports = [];
+		for (const pcTransport of observedPeerConnection.transportSamples()) {
+			const {
+				bytesReceived,
+				bytesSent,
+				...sample
+			} = pcTransport;
+			storedPeerConnection.transports.push(new Samples_ClientSample_PeerConnectionTransport({
+				...sample,
+				bytesReceived: BigInt(bytesReceived ?? -1),
+				bytesSent: BigInt(bytesSent ?? -1),
+			}));
 		}
 	}
 }