@observertc/observer-js 0.9.10-beta → 0.9.12-beta

package/lib/middlewares/VisitObservedCallsMiddleware.js

@@ -7,21 +7,31 @@ const logger_1 = require("../common/logger");
 const visitInboundAudioTrack_1 = require("./visitors/visitInboundAudioTrack");
 const visitOutboundAudioTrack_1 = require("./visitors/visitOutboundAudioTrack");
 const visitOutboundVideoTarck_1 = require("./visitors/visitOutboundVideoTarck");
+const visitInboundVideoTrack_1 = require("./visitors/visitInboundVideoTrack");
+const findRemoteMatches_1 = require("../processes/findRemoteMatches");
 exports.logger = (0, logger_1.createLogger)('VisitObservedCallsMiddleware');
-function createVisitObservedCallsMiddleware(reports, fetchSamples) {
+const emptyMap = new Map();
+function createVisitObservedCallsMiddleware(storages, reports, fetchSamples, findRemoteMatches) {
     const process = async (transaction) => {
-        const { observedCalls, clients, updatedPeerConnections, deletedPeerConnections, updatedInboundAudioTracks, deletedInboundAudioTracks, updatedInboundVideoTracks, deletedInboundVideoTracks, updatedOutboundAudioTracks, deletedOutboundAudioTracks, updatedOutboundVideoTracks, deletedOutboundVideoTracks, } = transaction;
+        var _a, _b, _c, _d;
+        const { observedCalls, clients, updatedPeerConnections, updatedInboundAudioTracks, updatedInboundVideoTracks, updatedOutboundAudioTracks, updatedOutboundVideoTracks, } = transaction;
         const visitedPeerConnectionIds = new Set();
         const visitedInboundAudioTrackIds = new Set();
         const visitedInboundVideoTrackIds = new Set();
         const visitedOutboundAudioTrackIds = new Set();
         const visitedOutboundVideoTrackIds = new Set();
+        const { remoteTrackIds, remotePeerConnectionIds, remoteClientIds } = !findRemoteMatches ? {
+            remoteTrackIds: emptyMap,
+            remotePeerConnectionIds: emptyMap,
+            remoteClientIds: emptyMap,
+        } : await (0, findRemoteMatches_1.findRemoteMatches)(storages, clients, new Map([...updatedInboundAudioTracks, ...updatedInboundVideoTracks]));
+        const now = BigInt(Date.now());
+        const fakeTouched = { touched: BigInt(0) };
         for (const observedCall of observedCalls.observedCalls()) {
             const { callId, serviceId, roomId } = observedCall;
             for (const observedClient of observedCall.observedClients()) {
                 const { clientId } = observedClient;
                 const storedClient = clients.get(clientId);
-                // console.warn("dskfjhdkfhsdkf", observedClient, storedClient);
                 if (!storedClient) {
                     // should not happen as client joined must have run before this
                     exports.logger.warn('Client has not been registered');
@@ -37,115 +47,35 @@ function createVisitObservedCallsMiddleware(reports, fetchSamples) {
                         exports.logger.warn(`PeerConnection ${peerConnectionId} has not been registered for client: ${clientId}, call ${callId}, room: ${roomId}, service: ${serviceId}`);
                         continue;
                     }
+                    storedPeerConnection.touched = now;
                     visitedPeerConnectionIds.add(peerConnectionId);
                     for (const observedInboundAudioTrack of observedPeerConnection.inboundAudioTracks()) {
                         const { trackId } = observedInboundAudioTrack;
-                        (0, visitInboundAudioTrack_1.visitInboundAudioTrack)(observedInboundAudioTrack, storedPeerConnection, updatedInboundAudioTracks, reports, fetchSamples);
+                        (0, visitInboundAudioTrack_1.visitInboundAudioTrack)(observedInboundAudioTrack, storedPeerConnection, updatedInboundAudioTracks, reports, fetchSamples, remoteTrackIds.get(trackId), remotePeerConnectionIds.get(trackId), remoteClientIds.get(trackId));
                         visitedInboundAudioTrackIds.add(trackId);
+                        ((_a = updatedInboundAudioTracks.get(trackId)) !== null && _a !== void 0 ? _a : fakeTouched).touched = now;
                     }
                     for (const observedInboundVideoTrack of observedPeerConnection.inboundVideoTracks()) {
                         const { trackId } = observedInboundVideoTrack;
-                        (0, visitInboundAudioTrack_1.visitInboundAudioTrack)(observedInboundVideoTrack, storedPeerConnection, updatedInboundVideoTracks, reports, fetchSamples);
+                        (0, visitInboundVideoTrack_1.visitInboundVideoTrack)(observedInboundVideoTrack, storedPeerConnection, updatedInboundVideoTracks, reports, fetchSamples, remoteTrackIds.get(trackId), remotePeerConnectionIds.get(trackId), remoteClientIds.get(trackId));
                         visitedInboundVideoTrackIds.add(trackId);
+                        ((_b = updatedInboundVideoTracks.get(trackId)) !== null && _b !== void 0 ? _b : fakeTouched).touched = now;
                     }
                     for (const observedOutboundAudioTrack of observedPeerConnection.outboundAudioTracks()) {
                         const { trackId } = observedOutboundAudioTrack;
                         (0, visitOutboundAudioTrack_1.visitOutboundAudioTrack)(observedOutboundAudioTrack, storedPeerConnection, updatedOutboundAudioTracks, reports, fetchSamples);
                         visitedOutboundAudioTrackIds.add(trackId);
+                        ((_c = updatedOutboundAudioTracks.get(trackId)) !== null && _c !== void 0 ? _c : fakeTouched).touched = now;
                     }
                     for (const observedOutboundVideoTrack of observedPeerConnection.outboundVideoTracks()) {
                         const { trackId } = observedOutboundVideoTrack;
                         (0, visitOutboundVideoTarck_1.visitOutboundVideoTrack)(observedOutboundVideoTrack, storedPeerConnection, updatedOutboundVideoTracks, reports, fetchSamples);
                         visitedOutboundVideoTrackIds.add(trackId);
+                        ((_d = updatedOutboundVideoTracks.get(trackId)) !== null && _d !== void 0 ? _d : fakeTouched).touched = now;
                     }
                 }
             }
         }
-        for (const [peerConnectionId, peerConnection] of Array.from(updatedPeerConnections.entries())) {
-            if (visitedPeerConnectionIds.has(peerConnectionId)) {
-                continue;
-            }
-            // delete PeerConnection
-            const { serviceId, callId, clientId } = peerConnection;
-            if (!serviceId || !callId || !clientId) {
-                continue;
-            }
-            const storedClient = clients.get(clientId);
-            updatedPeerConnections.delete(peerConnectionId);
-            deletedPeerConnections.add(peerConnectionId);
-            // also update the client model
-            if (storedClient) {
-                storedClient.peerConnectionIds = storedClient.peerConnectionIds.filter((pcId) => pcId !== peerConnectionId);
-            }
-        }
-        for (const [trackId, inboundAudioTrack] of Array.from(updatedInboundAudioTracks.entries())) {
-            if (visitedInboundAudioTrackIds.has(trackId)) {
-                continue;
-            }
-            // delete PeerConnection
-            const { serviceId, callId, clientId, peerConnectionId } = inboundAudioTrack;
-            if (!serviceId || !callId || !clientId || !peerConnectionId) {
-                continue;
-            }
-            const storedPeerConnection = updatedPeerConnections.get(peerConnectionId);
-            updatedInboundAudioTracks.delete(peerConnectionId);
-            deletedInboundAudioTracks.add(peerConnectionId);
-            // also update the peer connection model
-            if (storedPeerConnection) {
-                storedPeerConnection.inboundTrackIds = storedPeerConnection.inboundTrackIds.filter((tId) => tId !== trackId);
-            }
-        }
-        for (const [trackId, inboundVideoTrack] of Array.from(updatedInboundVideoTracks.entries())) {
-            if (visitedInboundVideoTrackIds.has(trackId)) {
-                continue;
-            }
-            // delete PeerConnection
-            const { serviceId, callId, clientId, peerConnectionId } = inboundVideoTrack;
-            if (!serviceId || !callId || !clientId || !peerConnectionId) {
-                continue;
-            }
-            const storedPeerConnection = updatedPeerConnections.get(peerConnectionId);
-            updatedInboundVideoTracks.delete(peerConnectionId);
-            deletedInboundVideoTracks.add(peerConnectionId);
-            // also update the peer connection model
-            if (storedPeerConnection) {
-                storedPeerConnection.inboundTrackIds = storedPeerConnection.inboundTrackIds.filter((tId) => tId !== trackId);
-            }
-        }
-        for (const [trackId, OutboundAudioTrack] of Array.from(updatedOutboundAudioTracks.entries())) {
-            if (visitedOutboundAudioTrackIds.has(trackId)) {
-                continue;
-            }
-            // delete PeerConnection
-            const { serviceId, callId, clientId, peerConnectionId } = OutboundAudioTrack;
-            if (!serviceId || !callId || !clientId || !peerConnectionId) {
-                continue;
-            }
-            const storedPeerConnection = updatedPeerConnections.get(peerConnectionId);
-            updatedOutboundAudioTracks.delete(peerConnectionId);
-            deletedOutboundAudioTracks.add(peerConnectionId);
-            // also update the peer connection model
-            if (storedPeerConnection) {
-                storedPeerConnection.outboundTrackIds = storedPeerConnection.outboundTrackIds.filter((tId) => tId !== trackId);
-            }
-        }
-        for (const [trackId, OutboundVideoTrack] of Array.from(updatedOutboundVideoTracks.entries())) {
-            if (visitedOutboundVideoTrackIds.has(trackId)) {
-                continue;
-            }
-            // delete PeerConnection
-            const { serviceId, callId, clientId, peerConnectionId } = OutboundVideoTrack;
-            if (!serviceId || !callId || !clientId || !peerConnectionId) {
-                continue;
-            }
-            const storedPeerConnection = updatedPeerConnections.get(peerConnectionId);
-            updatedOutboundVideoTracks.delete(peerConnectionId);
-            deletedOutboundVideoTracks.add(peerConnectionId);
-            // also update the peer connection model
-            if (storedPeerConnection) {
-                storedPeerConnection.outboundTrackIds = storedPeerConnection.outboundTrackIds.filter((tId) => tId !== trackId);
-            }
-        }
     };
     const result = async (context, next) => {
         await process(context);

package/lib/middlewares/visitors/visitClient.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"visitClient.d.ts","sourceRoot":"","sources":["../../../src/middlewares/visitors/visitClient.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,KAAK,MAAM,MAAM,qBAAqB,CAAC;AAC9C,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AASjE,wBAAgB,WAAW,CAC1B,cAAc,EAAE,cAAc,EAC9B,MAAM,EAAE,MAAM,CAAC,MAAM,EACrB,OAAO,EAAE,gBAAgB,EACzB,YAAY,EAAE,OAAO,QA6KrB"}
+{"version":3,"file":"visitClient.d.ts","sourceRoot":"","sources":["../../../src/middlewares/visitors/visitClient.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,KAAK,MAAM,MAAM,qBAAqB,CAAC;AAC9C,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AASjE,wBAAgB,WAAW,CAC1B,cAAc,EAAE,cAAc,EAC9B,MAAM,EAAE,MAAM,CAAC,MAAM,EACrB,OAAO,EAAE,gBAAgB,EACzB,YAAY,EAAE,OAAO,QA6LrB"}

package/lib/middlewares/visitors/visitClient.js

@@ -4,10 +4,13 @@ exports.visitClient = void 0;
 const callMetaReports_1 = require("../../common/callMetaReports");
 const samples_pb_1 = require("../../models/samples_pb");
 function visitClient(observedClient, client, reports, fetchSamples) {
-    const { mediaUnitId, clientId } = observedClient;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
+    const { mediaUnitId, clientId, userId } = observedClient;
     const { callId, serviceId, roomId } = observedClient.call;
     for (const clientSample of observedClient.samples()) {
-        if (clientSample.os) {
+        if (clientSample.os && (((_a = client.operationSystem) === null || _a === void 0 ? void 0 : _a.name) !== clientSample.os.name ||
+            ((_b = client.operationSystem) === null || _b === void 0 ? void 0 : _b.version) !== clientSample.os.version ||
+            ((_c = client.operationSystem) === null || _c === void 0 ? void 0 : _c.versionName) !== clientSample.os.versionName)) {
             if (fetchSamples) {
                 client.operationSystem = new samples_pb_1.Samples_ClientSample_OperationSystem({
                     ...clientSample.os,
@@ -16,10 +19,11 @@ function visitClient(observedClient, client, reports, fetchSamples) {
             const callMetaReport = (0, callMetaReports_1.createCallMetaReport)(serviceId, mediaUnitId, roomId, callId, clientId, {
                 type: callMetaReports_1.CallMetaType.OPERATION_SYSTEM,
                 payload: clientSample.os,
-            });
+            }, userId);
             reports.addCallMetaReport(callMetaReport);
         }
-        if (clientSample.engine) {
+        if (clientSample.engine && (((_d = client.engine) === null || _d === void 0 ? void 0 : _d.name) !== clientSample.engine.name ||
+            ((_e = client.engine) === null || _e === void 0 ? void 0 : _e.version) !== clientSample.engine.version)) {
             if (fetchSamples) {
                 client.engine = new samples_pb_1.Samples_ClientSample_Engine({
                     ...clientSample.engine,
@@ -28,10 +32,12 @@ function visitClient(observedClient, client, reports, fetchSamples) {
             const callMetaReport = (0, callMetaReports_1.createCallMetaReport)(serviceId, mediaUnitId, roomId, callId, clientId, {
                 type: callMetaReports_1.CallMetaType.ENGINE,
                 payload: clientSample.engine,
-            });
+            }, userId);
             reports.addCallMetaReport(callMetaReport);
         }
-        if (clientSample.platform) {
+        if (clientSample.platform && (((_f = client.platform) === null || _f === void 0 ? void 0 : _f.model) !== clientSample.platform.model ||
+            ((_g = client.platform) === null || _g === void 0 ? void 0 : _g.type) !== clientSample.platform.type ||
+            ((_h = client.platform) === null || _h === void 0 ? void 0 : _h.vendor) !== clientSample.platform.vendor)) {
             if (fetchSamples) {
                 client.platform = new samples_pb_1.Samples_ClientSample_Platform({
                     ...clientSample.platform,
@@ -40,10 +46,11 @@ function visitClient(observedClient, client, reports, fetchSamples) {
             const callMetaReport = (0, callMetaReports_1.createCallMetaReport)(serviceId, mediaUnitId, roomId, callId, clientId, {
                 type: callMetaReports_1.CallMetaType.PLATFORM,
                 payload: clientSample.platform,
-            });
+            }, userId);
             reports.addCallMetaReport(callMetaReport);
         }
-        if (clientSample.browser) {
+        if (clientSample.browser && (((_j = client.browser) === null || _j === void 0 ? void 0 : _j.name) !== clientSample.browser.name ||
+            ((_k = client.browser) === null || _k === void 0 ? void 0 : _k.version) !== clientSample.browser.version)) {
             if (fetchSamples) {
                 client.browser = new samples_pb_1.Samples_ClientSample_Browser({
                     ...clientSample.browser,
@@ -52,7 +59,7 @@ function visitClient(observedClient, client, reports, fetchSamples) {
             const callMetaReport = (0, callMetaReports_1.createCallMetaReport)(serviceId, mediaUnitId, roomId, callId, clientId, {
                 type: callMetaReports_1.CallMetaType.BROWSER,
                 payload: clientSample.browser,
-            });
+            }, userId);
             reports.addCallMetaReport(callMetaReport);
         }
         if (clientSample.mediaConstraints && 0 < clientSample.mediaConstraints.length) {
@@ -60,7 +67,7 @@ function visitClient(observedClient, client, reports, fetchSamples) {
                 const callMetaReport = (0, callMetaReports_1.createCallMetaReport)(serviceId, mediaUnitId, roomId, callId, clientId, {
                     type: callMetaReports_1.CallMetaType.MEDIA_CONSTRAINT,
                     payload: mediaConstraint,
-                });
+                }, userId);
                 reports.addCallMetaReport(callMetaReport);
             }
         }
@@ -69,7 +76,7 @@ function visitClient(observedClient, client, reports, fetchSamples) {
                 const callMetaReport = (0, callMetaReports_1.createCallMetaReport)(serviceId, mediaUnitId, roomId, callId, clientId, {
                     type: callMetaReports_1.CallMetaType.LOCAL_SDP,
                     payload: localSDP,
-                });
+                }, userId);
                 reports.addCallMetaReport(callMetaReport);
             }
         }
@@ -81,6 +88,7 @@ function visitClient(observedClient, client, reports, fetchSamples) {
                     roomId,
                     callId,
                     clientId,
+                    userId,
                     timestamp: Date.now(),
                     payload: extensionStats.payload,
                     extensionType: extensionStats.type,
@@ -95,6 +103,7 @@ function visitClient(observedClient, client, reports, fetchSamples) {
                     roomId,
                     callId,
                     clientId,
+                    userId,
                     timestamp: Date.now(),
                     ...callEvent,
                 });
@@ -105,7 +114,7 @@ function visitClient(observedClient, client, reports, fetchSamples) {
                 const callMetaReport = (0, callMetaReports_1.createCallMetaReport)(serviceId, mediaUnitId, roomId, callId, clientId, {
                     type: callMetaReports_1.CallMetaType.USER_MEDIA_ERROR,
                     payload: userMediaError,
-                });
+                }, userId);
                 reports.addCallMetaReport(callMetaReport);
             }
         }
@@ -114,7 +123,7 @@ function visitClient(observedClient, client, reports, fetchSamples) {
                 const callMetaReport = (0, callMetaReports_1.createCallMetaReport)(serviceId, mediaUnitId, roomId, callId, clientId, {
                     type: callMetaReports_1.CallMetaType.CERTIFICATE,
                     payload: certificate,
-                });
+                }, userId);
                 reports.addCallMetaReport(callMetaReport);
             }
         }
@@ -123,7 +132,7 @@ function visitClient(observedClient, client, reports, fetchSamples) {
                 const callMetaReport = (0, callMetaReports_1.createCallMetaReport)(serviceId, mediaUnitId, roomId, callId, clientId, {
                     type: callMetaReports_1.CallMetaType.CODEC,
                     payload: codec,
-                });
+                }, userId);
                 reports.addCallMetaReport(callMetaReport);
             }
         }
@@ -132,7 +141,7 @@ function visitClient(observedClient, client, reports, fetchSamples) {
                 const callMetaReport = (0, callMetaReports_1.createCallMetaReport)(serviceId, mediaUnitId, roomId, callId, clientId, {
                     type: callMetaReports_1.CallMetaType.ICE_SERVER,
                     payload: iceServer,
-                });
+                }, userId);
                 reports.addCallMetaReport(callMetaReport);
             }
         }
@@ -141,7 +150,7 @@ function visitClient(observedClient, client, reports, fetchSamples) {
                 const callMetaReport = (0, callMetaReports_1.createCallMetaReport)(serviceId, mediaUnitId, roomId, callId, clientId, {
                     type: callMetaReports_1.CallMetaType.MEDIA_DEVICE,
                     payload: mediaDevice,
-                });
+                }, userId);
                 reports.addCallMetaReport(callMetaReport);
             }
         }
@@ -150,7 +159,7 @@ function visitClient(observedClient, client, reports, fetchSamples) {
                 const callMetaReport = (0, callMetaReports_1.createCallMetaReport)(serviceId, mediaUnitId, roomId, callId, clientId, {
                     type: callMetaReports_1.CallMetaType.MEDIA_SOURCE,
                     payload: mediaSource,
-                });
+                }, userId);
                 reports.addCallMetaReport(callMetaReport);
             }
         }

package/lib/middlewares/visitors/visitInboundAudioTrack.d.ts

@@ -1,5 +1,5 @@
 import * as Models from '../../models/Models';
 import { ReportsCollector } from '../../common/ReportsCollector';
 import { ObservedInboundAudioTrack } from '../../samples/ObservedInboundAudioTrack';
-export declare function visitInboundAudioTrack(observedInboundAudioTrack: ObservedInboundAudioTrack, storedPeerConnection: Models.PeerConnection, storedInboundTracks: Map<string, Models.InboundTrack>, reports: ReportsCollector, fetchSamples: boolean): void;
+export declare function visitInboundAudioTrack(observedInboundAudioTrack: ObservedInboundAudioTrack, storedPeerConnection: Models.PeerConnection, storedInboundTracks: Map<string, Models.InboundTrack>, reports: ReportsCollector, fetchSamples: boolean, remoteTrackId?: string, remotePeerConnectionId?: string, remoteClientId?: string): void;
 //# sourceMappingURL=visitInboundAudioTrack.d.ts.map

package/lib/middlewares/visitors/visitInboundAudioTrack.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"visitInboundAudioTrack.d.ts","sourceRoot":"","sources":["../../../src/middlewares/visitors/visitInboundAudioTrack.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,qBAAqB,CAAC;AAC9C,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AACjE,OAAO,EAAE,yBAAyB,EAAE,MAAM,yCAAyC,CAAC;AAKpF,wBAAgB,sBAAsB,CACrC,yBAAyB,EAAE,yBAAyB,EACpD,oBAAoB,EAAE,MAAM,CAAC,cAAc,EAC3C,mBAAmB,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,YAAY,CAAC,EACrD,OAAO,EAAE,gBAAgB,EACzB,YAAY,EAAE,OAAO,QAqFrB"}
+{"version":3,"file":"visitInboundAudioTrack.d.ts","sourceRoot":"","sources":["../../../src/middlewares/visitors/visitInboundAudioTrack.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,qBAAqB,CAAC;AAC9C,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AACjE,OAAO,EAAE,yBAAyB,EAAE,MAAM,yCAAyC,CAAC;AAKpF,wBAAgB,sBAAsB,CACrC,yBAAyB,EAAE,yBAAyB,EACpD,oBAAoB,EAAE,MAAM,CAAC,cAAc,EAC3C,mBAAmB,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,YAAY,CAAC,EACrD,OAAO,EAAE,gBAAgB,EACzB,YAAY,EAAE,OAAO,EACrB,aAAa,CAAC,EAAE,MAAM,EACtB,sBAAsB,CAAC,EAAE,MAAM,EAC/B,cAAc,CAAC,EAAE,MAAM,QA4FvB"}

package/lib/middlewares/visitors/visitInboundAudioTrack.js

@@ -27,8 +27,8 @@ exports.visitInboundAudioTrack = void 0;
 const Models = __importStar(require("../../models/Models"));
 const VisitObservedCallsMiddleware_1 = require("../VisitObservedCallsMiddleware");
 const samples_pb_1 = require("../../models/samples_pb");
-function visitInboundAudioTrack(observedInboundAudioTrack, storedPeerConnection, storedInboundTracks, reports, fetchSamples) {
-    const { trackId } = observedInboundAudioTrack;
+function visitInboundAudioTrack(observedInboundAudioTrack, storedPeerConnection, storedInboundTracks, reports, fetchSamples, remoteTrackId, remotePeerConnectionId, remoteClientId) {
+    const { trackId, sfuStreamId, sfuSinkId } = observedInboundAudioTrack;
     const { peerConnectionId } = observedInboundAudioTrack.peerConnection;
     const { mediaUnitId, clientId, userId, marker, minTimestamp: timestamp, } = observedInboundAudioTrack.peerConnection.client;
     const { serviceId, roomId, callId } = observedInboundAudioTrack.peerConnection.client.call;
@@ -39,9 +39,12 @@ function visitInboundAudioTrack(observedInboundAudioTrack, storedPeerConnection,
             roomId,
             callId,
             clientId,
+            kind: 'audio',
             peerConnectionId,
             mediaUnitId,
             trackId,
+            sfuSinkId,
+            sfuStreamId,
             userId,
             marker,
         });
@@ -60,11 +63,15 @@ function visitInboundAudioTrack(observedInboundAudioTrack, storedPeerConnection,
             roomId,
             callId,
             clientId,
+            userId,
             mediaUnitId,
             peerConnectionId,
             ...inboundAudioSample,
             timestamp,
             sampleSeq: -1,
+            remoteClientId,
+            remotePeerConnectionId,
+            remoteTrackId,
         };
         reports.addInboundAudioTrackReport(report);
         if (fetchSamples) {
@@ -83,6 +90,7 @@ function visitInboundAudioTrack(observedInboundAudioTrack, storedPeerConnection,
             statsMap.set(ssrc, videoStats);
         }
     }
+    storedInboundAudioTrack.ssrc = [...statsMap.keys()];
     storedInboundAudioTrack.videoStats = Array.from(statsMap.values());
 }
 exports.visitInboundAudioTrack = visitInboundAudioTrack;

package/lib/middlewares/visitors/visitInboundVideoTrack.d.ts

@@ -1,5 +1,5 @@
 import { ReportsCollector } from '../../common/ReportsCollector';
 import { ObservedInboundVideoTrack } from '../../samples/ObservedInboundVideoTrack';
 import * as Models from '../../models/Models';
-export declare function visitInboundVideoTrack(observedInboundVideoTrack: ObservedInboundVideoTrack, storedPeerConnection: Models.PeerConnection, storedInboundTracks: Map<string, Models.InboundTrack>, reports: ReportsCollector, fetchSamples: boolean): void;
+export declare function visitInboundVideoTrack(observedInboundVideoTrack: ObservedInboundVideoTrack, storedPeerConnection: Models.PeerConnection, storedInboundTracks: Map<string, Models.InboundTrack>, reports: ReportsCollector, fetchSamples: boolean, remoteTrackId?: string, remotePeerConnectionId?: string, remoteClientId?: string): void;
 //# sourceMappingURL=visitInboundVideoTrack.d.ts.map

package/lib/middlewares/visitors/visitInboundVideoTrack.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"visitInboundVideoTrack.d.ts","sourceRoot":"","sources":["../../../src/middlewares/visitors/visitInboundVideoTrack.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AACjE,OAAO,EAAE,yBAAyB,EAAE,MAAM,yCAAyC,CAAC;AAEpF,OAAO,KAAK,MAAM,MAAM,qBAAqB,CAAC;AAK9C,wBAAgB,sBAAsB,CACrC,yBAAyB,EAAE,yBAAyB,EACpD,oBAAoB,EAAE,MAAM,CAAC,cAAc,EAC3C,mBAAmB,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,YAAY,CAAC,EACrD,OAAO,EAAE,gBAAgB,EACzB,YAAY,EAAE,OAAO,QAqFrB"}
+{"version":3,"file":"visitInboundVideoTrack.d.ts","sourceRoot":"","sources":["../../../src/middlewares/visitors/visitInboundVideoTrack.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AACjE,OAAO,EAAE,yBAAyB,EAAE,MAAM,yCAAyC,CAAC;AAEpF,OAAO,KAAK,MAAM,MAAM,qBAAqB,CAAC;AAK9C,wBAAgB,sBAAsB,CACrC,yBAAyB,EAAE,yBAAyB,EACpD,oBAAoB,EAAE,MAAM,CAAC,cAAc,EAC3C,mBAAmB,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,YAAY,CAAC,EACrD,OAAO,EAAE,gBAAgB,EACzB,YAAY,EAAE,OAAO,EACrB,aAAa,CAAC,EAAE,MAAM,EACtB,sBAAsB,CAAC,EAAE,MAAM,EAC/B,cAAc,CAAC,EAAE,MAAM,QA8FvB"}

package/lib/middlewares/visitors/visitInboundVideoTrack.js

@@ -28,8 +28,8 @@ const VisitObservedCallsMiddleware_1 = require("../VisitObservedCallsMiddleware"
 const Models = __importStar(require("../../models/Models"));
 const samples_pb_1 = require("../../models/samples_pb");
 // InboundVideoTrack visitor
-function visitInboundVideoTrack(observedInboundVideoTrack, storedPeerConnection, storedInboundTracks, reports, fetchSamples) {
-    const { trackId } = observedInboundVideoTrack;
+function visitInboundVideoTrack(observedInboundVideoTrack, storedPeerConnection, storedInboundTracks, reports, fetchSamples, remoteTrackId, remotePeerConnectionId, remoteClientId) {
+    const { trackId, sfuStreamId, sfuSinkId } = observedInboundVideoTrack;
     const { peerConnectionId } = observedInboundVideoTrack.peerConnection;
     const { mediaUnitId, clientId, userId, marker, minTimestamp: timestamp, } = observedInboundVideoTrack.peerConnection.client;
     const { serviceId, roomId, callId } = observedInboundVideoTrack.peerConnection.client.call;
@@ -40,9 +40,12 @@ function visitInboundVideoTrack(observedInboundVideoTrack, storedPeerConnection,
             roomId,
             callId,
             clientId,
+            kind: 'video',
             peerConnectionId,
             mediaUnitId,
             trackId,
+            sfuStreamId,
+            sfuSinkId,
             userId,
             marker,
         });
@@ -61,11 +64,15 @@ function visitInboundVideoTrack(observedInboundVideoTrack, storedPeerConnection,
             roomId,
             callId,
             clientId,
+            userId,
             mediaUnitId,
             peerConnectionId,
             ...inboundVideoSample,
             timestamp,
             sampleSeq: -1,
+            remoteClientId,
+            remotePeerConnectionId,
+            remoteTrackId,
         };
         reports.addInboundVideoTrackReport(report);
         if (fetchSamples) {
@@ -85,6 +92,7 @@ function visitInboundVideoTrack(observedInboundVideoTrack, storedPeerConnection,
             statsMap.set(ssrc, videoStats);
         }
     }
+    storedInboundVideoTrack.ssrc = [...statsMap.keys()];
     storedInboundVideoTrack.videoStats = Array.from(statsMap.values());
 }
 exports.visitInboundVideoTrack = visitInboundVideoTrack;

package/lib/middlewares/visitors/visitOutboundAudioTrack.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"visitOutboundAudioTrack.d.ts","sourceRoot":"","sources":["../../../src/middlewares/visitors/visitOutboundAudioTrack.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,qBAAqB,CAAC;AAC9C,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AACjE,OAAO,EAAE,0BAA0B,EAAE,MAAM,0CAA0C,CAAC;AAKtF,wBAAgB,uBAAuB,CACtC,0BAA0B,EAAE,0BAA0B,EACtD,oBAAoB,EAAE,MAAM,CAAC,cAAc,EAC3C,oBAAoB,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,aAAa,CAAC,EACvD,OAAO,EAAE,gBAAgB,EACzB,YAAY,EAAE,OAAO,QA+ErB"}
+{"version":3,"file":"visitOutboundAudioTrack.d.ts","sourceRoot":"","sources":["../../../src/middlewares/visitors/visitOutboundAudioTrack.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,qBAAqB,CAAC;AAC9C,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AACjE,OAAO,EAAE,0BAA0B,EAAE,MAAM,0CAA0C,CAAC;AAKtF,wBAAgB,uBAAuB,CACtC,0BAA0B,EAAE,0BAA0B,EACtD,oBAAoB,EAAE,MAAM,CAAC,cAAc,EAC3C,oBAAoB,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,aAAa,CAAC,EACvD,OAAO,EAAE,gBAAgB,EACzB,YAAY,EAAE,OAAO,QAmFrB"}

package/lib/middlewares/visitors/visitOutboundAudioTrack.js

@@ -28,7 +28,7 @@ const Models = __importStar(require("../../models/Models"));
 const VisitObservedCallsMiddleware_1 = require("../VisitObservedCallsMiddleware");
 const samples_pb_1 = require("../../models/samples_pb");
 function visitOutboundAudioTrack(observedOutboundAudioTrack, storedPeerConnection, storedOutboundTracks, reports, fetchSamples) {
-    const { trackId } = observedOutboundAudioTrack;
+    const { trackId, sfuStreamId } = observedOutboundAudioTrack;
     const { peerConnectionId } = observedOutboundAudioTrack.peerConnection;
     const { mediaUnitId, clientId, userId, marker, minTimestamp: timestamp, } = observedOutboundAudioTrack.peerConnection.client;
     const { serviceId, roomId, callId } = observedOutboundAudioTrack.peerConnection.client.call;
@@ -39,9 +39,11 @@ function visitOutboundAudioTrack(observedOutboundAudioTrack, storedPeerConnectio
             roomId,
             callId,
             clientId,
+            kind: 'audio',
             peerConnectionId,
             mediaUnitId,
             trackId,
+            sfuStreamId,
             userId,
             marker,
         });
@@ -60,6 +62,7 @@ function visitOutboundAudioTrack(observedOutboundAudioTrack, storedPeerConnectio
             roomId,
             callId,
             clientId,
+            userId,
             mediaUnitId,
             peerConnectionId,
             ...outboundAudioSample,
@@ -81,6 +84,7 @@ function visitOutboundAudioTrack(observedOutboundAudioTrack, storedPeerConnectio
             statsMap.set(ssrc, audioStats);
         }
     }
+    storedOutboundAudioTrack.ssrc = [...statsMap.keys()];
     storedOutboundAudioTrack.audioStats = Array.from(statsMap.values());
 }
 exports.visitOutboundAudioTrack = visitOutboundAudioTrack;

package/lib/middlewares/visitors/visitOutboundVideoTarck.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"visitOutboundVideoTarck.d.ts","sourceRoot":"","sources":["../../../src/middlewares/visitors/visitOutboundVideoTarck.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,qBAAqB,CAAC;AAC9C,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AACjE,OAAO,EAAE,0BAA0B,EAAE,MAAM,0CAA0C,CAAC;AAKtF,wBAAgB,uBAAuB,CACtC,0BAA0B,EAAE,0BAA0B,EACtD,oBAAoB,EAAE,MAAM,CAAC,cAAc,EAC3C,oBAAoB,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,aAAa,CAAC,EACvD,OAAO,EAAE,gBAAgB,EACzB,YAAY,EAAE,OAAO,QAiFrB"}
+{"version":3,"file":"visitOutboundVideoTarck.d.ts","sourceRoot":"","sources":["../../../src/middlewares/visitors/visitOutboundVideoTarck.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,qBAAqB,CAAC;AAC9C,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AACjE,OAAO,EAAE,0BAA0B,EAAE,MAAM,0CAA0C,CAAC;AAKtF,wBAAgB,uBAAuB,CACtC,0BAA0B,EAAE,0BAA0B,EACtD,oBAAoB,EAAE,MAAM,CAAC,cAAc,EAC3C,oBAAoB,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,aAAa,CAAC,EACvD,OAAO,EAAE,gBAAgB,EACzB,YAAY,EAAE,OAAO,QAqFrB"}

package/lib/middlewares/visitors/visitOutboundVideoTarck.js

@@ -28,7 +28,7 @@ const Models = __importStar(require("../../models/Models"));
 const VisitObservedCallsMiddleware_1 = require("../VisitObservedCallsMiddleware");
 const samples_pb_1 = require("../../models/samples_pb");
 function visitOutboundVideoTrack(observedOutboundVideoTrack, storedPeerConnection, storedOutboundTracks, reports, fetchSamples) {
-    const { trackId } = observedOutboundVideoTrack;
+    const { trackId, sfuStreamId } = observedOutboundVideoTrack;
     const { peerConnectionId } = observedOutboundVideoTrack.peerConnection;
     const { mediaUnitId, clientId, userId, marker, minTimestamp: timestamp, } = observedOutboundVideoTrack.peerConnection.client;
     const { serviceId, roomId, callId } = observedOutboundVideoTrack.peerConnection.client.call;
@@ -39,9 +39,11 @@ function visitOutboundVideoTrack(observedOutboundVideoTrack, storedPeerConnectio
             roomId,
             callId,
             clientId,
+            kind: 'video',
             peerConnectionId,
             mediaUnitId,
             trackId,
+            sfuStreamId,
             userId,
             marker,
         });
@@ -60,6 +62,7 @@ function visitOutboundVideoTrack(observedOutboundVideoTrack, storedPeerConnectio
             roomId,
             callId,
             clientId,
+            userId,
             mediaUnitId,
             peerConnectionId,
             ...outboundVideoSample,
@@ -82,6 +85,7 @@ function visitOutboundVideoTrack(observedOutboundVideoTrack, storedPeerConnectio
             statsMap.set(ssrc, videoStats);
         }
     }
+    storedOutboundVideoTrack.ssrc = [...statsMap.keys()];
     storedOutboundVideoTrack.videoStats = Array.from(statsMap.values());
 }
 exports.visitOutboundVideoTrack = visitOutboundVideoTrack;

package/lib/middlewares/visitors/visitPeerConnection.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"visitPeerConnection.d.ts","sourceRoot":"","sources":["../../../src/middlewares/visitors/visitPeerConnection.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,sCAAsC,CAAC;AAC9E,OAAO,KAAK,MAAM,MAAM,qBAAqB,CAAC;AAC9C,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AAKjE,wBAAgB,mBAAmB,CAClC,sBAAsB,EAAE,sBAAsB,EAC9C,YAAY,EAAE,MAAM,CAAC,MAAM,EAC3B,qBAAqB,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,cAAc,CAAC,EACzD,OAAO,EAAE,gBAAgB,EACzB,YAAY,EAAE,OAAO,QAwGrB"}
+{"version":3,"file":"visitPeerConnection.d.ts","sourceRoot":"","sources":["../../../src/middlewares/visitors/visitPeerConnection.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,sCAAsC,CAAC;AAC9E,OAAO,KAAK,MAAM,MAAM,qBAAqB,CAAC;AAC9C,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AAKjE,wBAAgB,mBAAmB,CAClC,sBAAsB,EAAE,sBAAsB,EAC9C,YAAY,EAAE,MAAM,CAAC,MAAM,EAC3B,qBAAqB,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,cAAc,CAAC,EACzD,OAAO,EAAE,gBAAgB,EACzB,YAAY,EAAE,OAAO,QAwHrB"}

package/lib/middlewares/visitors/visitPeerConnection.js

@@ -59,6 +59,7 @@ function visitPeerConnection(observedPeerConnection, storedClient, storedPeerCon
             roomId,
             callId,
             clientId,
+            userId,
             mediaUnitId,
             ...pcTransport,
             timestamp,
@@ -66,6 +67,20 @@ function visitPeerConnection(observedPeerConnection, storedClient, storedPeerCon
         };
         reports.addPeerConnectionTransportReports(report);
     }
+    for (const iceCandidatePair of observedPeerConnection.iceCandidatePairs()) {
+        const report = {
+            serviceId,
+            roomId,
+            callId,
+            userId,
+            clientId,
+            mediaUnitId,
+            ...iceCandidatePair,
+            timestamp,
+            sampleSeq: -1, // deprecated
+        };
+        reports.addIceCandidatePairReport(report);
+    }
     if (fetchSamples) {
         storedPeerConnection.icelocalCandidates = [];
         for (const iceLocalCandidate of observedPeerConnection.iceLocalCandidates()) {