From 740c694205d44af38d974badf259e0511abaae72 Mon Sep 17 00:00:00 2001
From: Balazs Kreith <kreith.balazs@gmail.com>
Date: Sun, 24 Mar 2024 12:56:45 +0300
Subject: [PATCH] save

---
 package.json                  |  2 +-
 src/ObservedClient.ts         | 50 ++++++++++++++++++++++++++++-------
 src/ObservedICE.ts            | 16 ++++++++---
 src/ObservedSfu.ts            |  2 ++
 src/common/callMetaReports.ts |  1 +
 5 files changed, 56 insertions(+), 15 deletions(-)

diff --git a/package.json b/package.json
index 974d1b7..d67c3dc 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@observertc/observer-js",
-  "version": "0.40.10-beta",
+  "version": "0.40.11-beta",
   "description": "Server Side NodeJS Library for processing ObserveRTC Samples",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
diff --git a/src/ObservedClient.ts b/src/ObservedClient.ts
index 24b9a39..2c7e4e1 100644
--- a/src/ObservedClient.ts
+++ b/src/ObservedClient.ts
@@ -47,6 +47,7 @@ export type ObservedClientEvents = {
 		remoteCandidate: IceRemoteCandidate,
 	}],
 	usingturn: [boolean],
+	usermediaerror: [string],
 };
 
 export declare interface ObservedClient<AppData extends Record<string, unknown> = Record<string, unknown>> {
@@ -252,7 +253,11 @@ export class ObservedClient<AppData extends Record<string, unknown> = Record<str
 				{
 					type: CallMetaType.OPERATION_SYSTEM,
 					payload: sample.os,
-				}, this.userId);
+				}, 
+				this.userId,
+				undefined,
+				sample.timestamp
+			);
 	
 			this.reports.addCallMetaReport(callMetaReport);
 		}
@@ -272,7 +277,11 @@ export class ObservedClient<AppData extends Record<string, unknown> = Record<str
 				{
 					type: CallMetaType.ENGINE,
 					payload: sample.engine,
-				}, this.userId);
+				}, 
+				this.userId,
+				undefined,
+				sample.timestamp
+			);
 	
 			this.reports.addCallMetaReport(callMetaReport);
 		}
@@ -293,7 +302,11 @@ export class ObservedClient<AppData extends Record<string, unknown> = Record<str
 				{
 					type: CallMetaType.PLATFORM,
 					payload: sample.platform,
-				}, this.userId);
+				},
+				this.userId,
+				undefined,
+				sample.timestamp
+			);
 	
 			this.reports.addCallMetaReport(callMetaReport);
 		}
@@ -313,7 +326,11 @@ export class ObservedClient<AppData extends Record<string, unknown> = Record<str
 				{
 					type: CallMetaType.BROWSER,
 					payload: sample.browser,
-				}, this.userId);
+				}, 
+				this.userId,
+				undefined,
+				sample.timestamp
+			);
 	
 			this.reports.addCallMetaReport(callMetaReport);
 		}
@@ -328,7 +345,11 @@ export class ObservedClient<AppData extends Record<string, unknown> = Record<str
 				{
 					type: CallMetaType.MEDIA_CONSTRAINT,
 					payload: mediaConstraint,
-				}, this.userId);
+				}, 
+				this.userId,
+				undefined,
+				sample.timestamp
+			);
 
 			this.reports.addCallMetaReport(callMetaReport);
 		}
@@ -343,7 +364,11 @@ export class ObservedClient<AppData extends Record<string, unknown> = Record<str
 				{
 					type: CallMetaType.LOCAL_SDP,
 					payload: localSDP,
-				}, this.userId);
+				}, 
+				this.userId,
+				undefined,
+				sample.timestamp
+			);
 
 			this.reports.addCallMetaReport(callMetaReport);
 		}
@@ -390,10 +415,13 @@ export class ObservedClient<AppData extends Record<string, unknown> = Record<str
 				this.clientId, {
 					type: CallMetaType.USER_MEDIA_ERROR,
 					payload: userMediaError,
-				}, this.userId);
+				}, 
+				this.userId,
+			);
 
 			this.reports.addCallMetaReport(callMetaReport);
 			this.userMediaErrors.push(userMediaError);
+			this.emit('usermediaerror', userMediaError);
 		}
 
 		for (const certificate of sample.certificates ?? []) {
@@ -405,7 +433,9 @@ export class ObservedClient<AppData extends Record<string, unknown> = Record<str
 				this.clientId, {
 					type: CallMetaType.CERTIFICATE,
 					payload: certificate,
-				}, this.userId);
+				}, 
+				this.userId
+			);
 
 			this.reports.addCallMetaReport(callMetaReport);
 		}
@@ -606,7 +636,7 @@ export class ObservedClient<AppData extends Record<string, unknown> = Record<str
 				continue;
 			}
 
-			peerConnection.ICE.addLocalCandidate(iceLocalCandidate);
+			peerConnection.ICE.addLocalCandidate(iceLocalCandidate, sample.timestamp);
 		}
 	
 		for (const iceRemoteCandidate of sample.iceRemoteCandidates ?? []) {
@@ -621,7 +651,7 @@ export class ObservedClient<AppData extends Record<string, unknown> = Record<str
 				continue;
 			}
 
-			peerConnection.ICE.addRemoteCandidate(iceRemoteCandidate);
+			peerConnection.ICE.addRemoteCandidate(iceRemoteCandidate, sample.timestamp);
 		}
 
 		for (const candidatePair of sample.iceCandidatePairs ?? []) {
diff --git a/src/ObservedICE.ts b/src/ObservedICE.ts
index e52853c..f106ad3 100644
--- a/src/ObservedICE.ts
+++ b/src/ObservedICE.ts
@@ -100,7 +100,7 @@ export class ObservedICE extends EventEmitter {
 		this.emit('close');
 	}
 
-	public addLocalCandidate(candidate: IceLocalCandidate) {
+	public addLocalCandidate(candidate: IceLocalCandidate, sampleTimestamp?: number) {
 		if (!candidate.id) return;
 
 		const newCandidate = !this._localCandidates.has(candidate.id);
@@ -116,7 +116,11 @@ export class ObservedICE extends EventEmitter {
 				this.peerConnection.client.clientId, {
 					type: CallMetaType.ICE_LOCAL_CANDIDATE,
 					payload: candidate,
-				}, this.peerConnection.client.userId);
+				}, 
+				this.peerConnection.client.userId,
+				this.peerConnection.peerConnectionId,
+				sampleTimestamp,
+			);
 
 			this.reports.addCallMetaReport(callMetaReport);
 
@@ -124,7 +128,7 @@ export class ObservedICE extends EventEmitter {
 		}
 	}
 
-	public addRemoteCandidate(candidate: IceRemoteCandidate) {
+	public addRemoteCandidate(candidate: IceRemoteCandidate, sampleTimestamp?: number) {
 		if (!candidate.id) return;
 
 		const newCandidate = !this._remoteCandidates.has(candidate.id);
@@ -140,7 +144,11 @@ export class ObservedICE extends EventEmitter {
 				this.peerConnection.client.clientId, {
 					type: CallMetaType.ICE_REMOTE_CANDIDATE,
 					payload: candidate,
-				}, this.peerConnection.client.userId);
+				}, 
+				this.peerConnection.client.userId,
+				this.peerConnection.peerConnectionId,
+				sampleTimestamp
+			);
 
 			this.reports.addCallMetaReport(callMetaReport);
             
diff --git a/src/ObservedSfu.ts b/src/ObservedSfu.ts
index b8bef12..929e703 100644
--- a/src/ObservedSfu.ts
+++ b/src/ObservedSfu.ts
@@ -105,6 +105,8 @@ export class ObservedSfu<AppData extends Record<string, unknown> = Record<string
 			this._timeZoneOffsetInHours = sample.timeZoneOffsetInHours;
 		}
 
+		this._marker = sample.marker;
+
 		const now = Date.now();
 		const elapsedTimeInMs = now - this._updated;
 
diff --git a/src/common/callMetaReports.ts b/src/common/callMetaReports.ts
index 9242f20..906fe86 100644
--- a/src/common/callMetaReports.ts
+++ b/src/common/callMetaReports.ts
@@ -84,6 +84,7 @@ export function createCallMetaReport(
 	clientId: string,
 	reportType: CallMetaReportType,
 	userId?: string,
+	peerConnectionId?: string,
 	timestamp?: number
 ) {
 	const report: CallMetaReport = {