@observertc/observer-js 1.0.0-beta.10 → 1.0.0-beta.12

package/dist/index.js

@@ -2250,7 +2250,8 @@ var ObservedClient = class extends import_events2.EventEmitter {
   // public totalNumberOfIssues = 0;
   mediaDevices = [];
   issues = [];
-  _injections = {};
+  _pendingInjections = {};
+  _activeSample;
   closeTimer;
   get numberOfPeerConnections() {
     return this.observedPeerConnections.size;
@@ -2260,11 +2261,8 @@ var ObservedClient = class extends import_events2.EventEmitter {
   }
   close() {
     if (this.closed) return;
+    this._flushPendingInjections();
     this.closed = true;
-    this._injections.clientEvents?.forEach((clientEvent) => this._processClientEvent(clientEvent));
-    this._injections.clientIssues?.forEach((clientIssue) => this.addIssue(clientIssue));
-    this._injections.extensionStats?.forEach((extensionStat) => this.addExtensionStats(extensionStat));
-    this._injections.clientMetaItems?.forEach((clientMetaItem) => this.addMetadata(clientMetaItem));
     Array.from(this.observedPeerConnections.values()).forEach((peerConnection) => peerConnection.close());
     if (!this.leftAt) {
       this.leftAt = this.lastSampleTimestamp;
@@ -2287,7 +2285,6 @@ var ObservedClient = class extends import_events2.EventEmitter {
       logger2.warn("Attempted to accept a sample on a closed client %s", this.clientId);
       return;
     }
-    this.sink?.write(sample);
     if (this.closeTimer) {
       clearTimeout(this.closeTimer);
       this.closeTimer = void 0;
@@ -2327,7 +2324,8 @@ var ObservedClient = class extends import_events2.EventEmitter {
     this.usingTCP = false;
     this.currentMinRttInMs = void 0;
     this.currentMaxRttInMs = void 0;
-    this._mergeInjections(sample);
+    this._mergePendingInjections(sample);
+    this._activeSample = sample;
     const clientEventsPostBuffer = [];
     for (const clientEvent of sample.clientEvents ?? []) {
       this._processClientEvent(clientEvent, clientEventsPostBuffer);
@@ -2415,31 +2413,68 @@ var ObservedClient = class extends import_events2.EventEmitter {
         this.close();
       }, this.settings.closeClientIfIdleForMs);
     }
+    this._activeSample = void 0;
+    try {
+      this.sink?.write(sample);
+    } catch (err) {
+      logger2.warn("ClientSampleSink.write failed for client %s: %o", this.clientId, err);
+    }
   }
   injectMetaData(metaData) {
     if (this.closed) return;
-    if (!this._injections.clientMetaItems) this._injections.clientMetaItems = [];
-    this._injections.clientMetaItems.push(metaData);
+    if (this._activeSample) {
+      if (!this._activeSample.clientMetaItems) this._activeSample.clientMetaItems = [];
+      this._activeSample.clientMetaItems.push(metaData);
+      this.addMetadata(metaData);
+      return;
+    }
+    if (!this._pendingInjections.clientMetaItems) this._pendingInjections.clientMetaItems = [];
+    this._pendingInjections.clientMetaItems.push(metaData);
   }
   injectEvent(event) {
     if (this.closed) return;
-    if (!this._injections.clientEvents) this._injections.clientEvents = [];
-    this._injections.clientEvents.push(event);
+    if (this._activeSample) {
+      if (!this._activeSample.clientEvents) this._activeSample.clientEvents = [];
+      this._activeSample.clientEvents.push(event);
+      this._processClientEvent(event);
+      return;
+    }
+    if (!this._pendingInjections.clientEvents) this._pendingInjections.clientEvents = [];
+    this._pendingInjections.clientEvents.push(event);
   }
   injectIssue(issue) {
     if (this.closed) return;
-    if (!this._injections.clientIssues) this._injections.clientIssues = [];
-    this._injections.clientIssues.push(issue);
+    if (this._activeSample) {
+      if (!this._activeSample.clientIssues) this._activeSample.clientIssues = [];
+      this._activeSample.clientIssues.push(issue);
+      this.addIssue(issue);
+      ++this.deltaNumberOfIssues;
+      return;
+    }
+    if (!this._pendingInjections.clientIssues) this._pendingInjections.clientIssues = [];
+    this._pendingInjections.clientIssues.push(issue);
   }
   injectExtensionStat(stat) {
     if (this.closed) return;
-    if (!this._injections.extensionStats) this._injections.extensionStats = [];
-    this._injections.extensionStats.push(stat);
+    if (this._activeSample) {
+      if (!this._activeSample.extensionStats) this._activeSample.extensionStats = [];
+      this._activeSample.extensionStats.push(stat);
+      this.addExtensionStats(stat);
+      return;
+    }
+    if (!this._pendingInjections.extensionStats) this._pendingInjections.extensionStats = [];
+    this._pendingInjections.extensionStats.push(stat);
   }
-  injectAttachment(key, value) {
+  injectAttachment(attachments) {
     if (this.closed) return;
-    if (!this._injections.attachments) this._injections.attachments = {};
-    this._injections.attachments[key] = value;
+    if (this._activeSample) {
+      if (!this._activeSample.attachments) this._activeSample.attachments = {};
+      Object.assign(this._activeSample.attachments, attachments);
+      this.attachments = this._activeSample.attachments;
+      return;
+    }
+    if (!this._pendingInjections.attachments) this._pendingInjections.attachments = {};
+    Object.assign(this._pendingInjections.attachments, attachments);
   }
   addMetadata(metadata) {
     if (this.closed) return;
@@ -2701,35 +2736,53 @@ var ObservedClient = class extends import_events2.EventEmitter {
     observedPeerConnection.accept(sample, context);
     return observedPeerConnection;
   }
-  _mergeInjections(sample) {
+  _mergePendingInjections(sample) {
     if (this.closed) return sample;
-    if (this._injections.clientEvents) {
+    if (this._pendingInjections.clientEvents) {
       if (!sample.clientEvents) sample.clientEvents = [];
-      sample.clientEvents.push(...this._injections.clientEvents);
-      this._injections.clientEvents = void 0;
+      sample.clientEvents.push(...this._pendingInjections.clientEvents);
+      this._pendingInjections.clientEvents = void 0;
     }
-    if (this._injections.clientIssues) {
+    if (this._pendingInjections.clientIssues) {
       if (!sample.clientIssues) sample.clientIssues = [];
-      sample.clientIssues.push(...this._injections.clientIssues);
-      this._injections.clientIssues = void 0;
+      sample.clientIssues.push(...this._pendingInjections.clientIssues);
+      this._pendingInjections.clientIssues = void 0;
     }
-    if (this._injections.extensionStats) {
+    if (this._pendingInjections.extensionStats) {
       if (!sample.extensionStats) sample.extensionStats = [];
-      sample.extensionStats.push(...this._injections.extensionStats);
-      this._injections.extensionStats = void 0;
+      sample.extensionStats.push(...this._pendingInjections.extensionStats);
+      this._pendingInjections.extensionStats = void 0;
     }
-    if (this._injections.attachments) {
+    if (this._pendingInjections.attachments) {
       if (!sample.attachments) sample.attachments = {};
-      Object.assign(sample.attachments, this._injections.attachments);
-      this._injections.attachments = void 0;
+      Object.assign(sample.attachments, this._pendingInjections.attachments);
+      this._pendingInjections.attachments = void 0;
     }
-    if (this._injections.clientMetaItems) {
+    if (this._pendingInjections.clientMetaItems) {
       if (!sample.clientMetaItems) sample.clientMetaItems = [];
-      sample.clientMetaItems.push(...this._injections.clientMetaItems);
-      this._injections.clientMetaItems = void 0;
+      sample.clientMetaItems.push(...this._pendingInjections.clientMetaItems);
+      this._pendingInjections.clientMetaItems = void 0;
     }
     return sample;
   }
+  _flushPendingInjections() {
+    const hasPending = Boolean(
+      this._pendingInjections.clientEvents || this._pendingInjections.clientIssues || this._pendingInjections.extensionStats || this._pendingInjections.clientMetaItems || this._pendingInjections.attachments
+    );
+    if (!hasPending) return;
+    const finalSample = { timestamp: Date.now() };
+    this._mergePendingInjections(finalSample);
+    for (const clientEvent of finalSample.clientEvents ?? []) this._processClientEvent(clientEvent);
+    for (const metaData of finalSample.clientMetaItems ?? []) this.addMetadata(metaData);
+    for (const issue of finalSample.clientIssues ?? []) this.addIssue(issue);
+    for (const extensionStat of finalSample.extensionStats ?? []) this.addExtensionStats(extensionStat);
+    if (finalSample.attachments) this.attachments = { ...this.attachments, ...finalSample.attachments };
+    try {
+      this.sink?.write(finalSample);
+    } catch (err) {
+      logger2.warn("ClientSampleSink.write failed during injection flush for client %s: %o", this.clientId, err);
+    }
+  }
   /** Emit an Observer-bus event scoped to this client (or a peer connection under it). */
   _notify(type, ...args) {
     this.call.observer.emit(type, ...args);
@@ -3305,12 +3358,9 @@ var import_events5 = require("events");
 var logger6 = createLogger("ObservedMediasoupRouter");
 var ObservedMediasoupRouter = class extends import_events5.EventEmitter {
   router;
-  sample;
   appData;
+  sample;
   webrtcTransportIds = /* @__PURE__ */ new Set();
-  get attachments() {
-    return this.sample.attachments;
-  }
   closed = false;
   constructor(settings) {
     super();
@@ -3331,6 +3381,15 @@ var ObservedMediasoupRouter = class extends import_events5.EventEmitter {
   get id() {
     return this.router.id;
   }
+  get attachments() {
+    return this.sample.attachments;
+  }
+  close() {
+    if (this.closed) return;
+    this.closed = true;
+    if (this.sample.closedAt === void 0) this.sample.closedAt = Date.now();
+    this.emit("close");
+  }
   addTransport = (transport) => {
     let transportType = transport.type;
     if (!transportType) {
@@ -3363,35 +3422,17 @@ var ObservedMediasoupRouter = class extends import_events5.EventEmitter {
       history
     };
     this.sample.transports.push(transportSample);
-    const onIceStateChange = (iceState) => {
-      history.push({
-        type: `icestate-changed-to-${iceState}`,
-        timestamp: Date.now()
-      });
-    };
+    this.webrtcTransportIds.add(transport.id);
+    const onIceStateChange = (iceState) => history.push({ type: `icestate-changed-to-${iceState}`, timestamp: Date.now() });
     const onIceSelectedTupleChange = (tuple) => {
       transportSample.tuple = tuple;
-      history.push({
-        type: "iceselectedtuple-changed",
-        timestamp: Date.now(),
-        ...tuple
-      });
+      history.push({ type: "iceselectedtuple-changed", timestamp: Date.now(), ...tuple });
     };
     const onDtlsStateChange = (dtlsState) => {
-      history.push({
-        type: `dtlsstate-changed-to-${dtlsState}`,
-        timestamp: Date.now()
-      });
-      if (dtlsState === "connected" && transportSample.connectedAt === void 0) {
-        transportSample.connectedAt = Date.now();
-      }
-    };
-    const onSctpStateChange = (sctpState) => {
-      history.push({
-        type: `sctpstate-changed-to-${sctpState}`,
-        timestamp: Date.now()
-      });
+      history.push({ type: `dtlsstate-changed-to-${dtlsState}`, timestamp: Date.now() });
+      if (dtlsState === "connected" && transportSample.connectedAt === void 0) transportSample.connectedAt = Date.now();
     };
+    const onSctpStateChange = (sctpState) => history.push({ type: `sctpstate-changed-to-${sctpState}`, timestamp: Date.now() });
     this._attachTransportObserverListeners(transport, transportSample, () => {
       transport.observer.off("icestatechange", onIceStateChange);
       transport.observer.off("iceselectedtuplechange", onIceSelectedTupleChange);
@@ -3403,7 +3444,6 @@ var ObservedMediasoupRouter = class extends import_events5.EventEmitter {
     transport.observer.on("iceselectedtuplechange", onIceSelectedTupleChange);
     transport.observer.on("dtlsstatechange", onDtlsStateChange);
     transport.observer.on("sctpstatechange", onSctpStateChange);
-    this.webrtcTransportIds.add(transport.id);
   }
   addPlainTransport(transport) {
     const history = [];
@@ -3426,13 +3466,8 @@ var ObservedMediasoupRouter = class extends import_events5.EventEmitter {
       history.push({ type: "rtcptuple-changed", timestamp: Date.now(), ...rtcpTuple });
     };
     const onSctpStateChange = (sctpState) => {
-      if (sctpState === "connected" && transportSample.connectedAt === void 0) {
-        transportSample.connectedAt = Date.now();
-      }
-      history.push({
-        type: `sctpstate-changed-to-${sctpState}`,
-        timestamp: Date.now()
-      });
+      if (sctpState === "connected" && transportSample.connectedAt === void 0) transportSample.connectedAt = Date.now();
+      history.push({ type: `sctpstate-changed-to-${sctpState}`, timestamp: Date.now() });
     };
     this._attachTransportObserverListeners(transport, transportSample, () => {
       transport.observer.off("tuple", onTuple);
@@ -3454,13 +3489,8 @@ var ObservedMediasoupRouter = class extends import_events5.EventEmitter {
     };
     this.sample.transports.push(transportSample);
     const onSctpStateChange = (sctpState) => {
-      if (sctpState === "connected" && transportSample.connectedAt === void 0) {
-        transportSample.connectedAt = Date.now();
-      }
-      history.push({
-        type: `sctpstate-changed-to-${sctpState}`,
-        timestamp: Date.now()
-      });
+      if (sctpState === "connected" && transportSample.connectedAt === void 0) transportSample.connectedAt = Date.now();
+      history.push({ type: `sctpstate-changed-to-${sctpState}`, timestamp: Date.now() });
     };
     this._attachTransportObserverListeners(transport, transportSample, () => {
       transport.observer.off("sctpstatechange", onSctpStateChange);
@@ -3473,7 +3503,6 @@ var ObservedMediasoupRouter = class extends import_events5.EventEmitter {
       id: transport.id,
       type: "direct",
       createdAt: now,
-      // A DirectTransport has no network layer — it is connected the instant it exists.
       connectedAt: now,
       history: []
     };
@@ -3482,37 +3511,26 @@ var ObservedMediasoupRouter = class extends import_events5.EventEmitter {
   }
   addProducer(transport, producer) {
     const firstCodec = producer.rtpParameters.codecs[0];
-    const codecInfo = {
-      mimeType: firstCodec?.mimeType ?? "unknown/unknown",
-      payloadType: firstCodec?.payloadType ?? 0,
-      clockRate: firstCodec?.clockRate ?? 0,
-      channels: firstCodec?.channels,
-      parameters: firstCodec?.parameters,
-      rtcpFeedback: firstCodec?.rtcpFeedback
-    };
     const producerSample = {
       id: producer.id,
+      transportId: transport.id,
       createdAt: Date.now(),
       kind: producer.kind,
-      codecInfo,
-      ssrcs: producer.rtpParameters.encodings?.map((encoding) => encoding.ssrc).filter((ssrc) => typeof ssrc === "number"),
-      rids: producer.rtpParameters.encodings?.map((encoding) => encoding.rid).filter((rid) => typeof rid === "string"),
-      history: [],
-      transportId: transport.id
+      codecInfo: {
+        mimeType: firstCodec?.mimeType ?? "unknown/unknown",
+        payloadType: firstCodec?.payloadType ?? 0,
+        clockRate: firstCodec?.clockRate ?? 0,
+        channels: firstCodec?.channels,
+        parameters: firstCodec?.parameters,
+        rtcpFeedback: firstCodec?.rtcpFeedback
+      },
+      ssrcs: producer.rtpParameters.encodings?.map((e) => e.ssrc).filter((s) => typeof s === "number"),
+      rids: producer.rtpParameters.encodings?.map((e) => e.rid).filter((r) => typeof r === "string"),
+      history: []
     };
     this.sample.producers.push(producerSample);
-    const onPause = () => {
-      producerSample.history.push({
-        type: "pause",
-        timestamp: Date.now()
-      });
-    };
-    const onResume = () => {
-      producerSample.history.push({
-        type: "resume",
-        timestamp: Date.now()
-      });
-    };
+    const onPause = () => producerSample.history.push({ type: "pause", timestamp: Date.now() });
+    const onResume = () => producerSample.history.push({ type: "resume", timestamp: Date.now() });
     producer.observer.once("close", () => {
       producer.observer.off("pause", onPause);
       producer.observer.off("resume", onResume);
@@ -3531,30 +3549,10 @@ var ObservedMediasoupRouter = class extends import_events5.EventEmitter {
       history: []
     };
     this.sample.consumers.push(consumerSample);
-    const onPause = () => {
-      consumerSample.history.push({
-        type: "pause",
-        timestamp: Date.now()
-      });
-    };
-    const onResume = () => {
-      consumerSample.history.push({
-        type: "resume",
-        timestamp: Date.now()
-      });
-    };
-    const onProducerPause = () => {
-      consumerSample.history.push({
-        type: "producerPaused",
-        timestamp: Date.now()
-      });
-    };
-    const onProducerResume = () => {
-      consumerSample.history.push({
-        type: "producerResumed",
-        timestamp: Date.now()
-      });
-    };
+    const onPause = () => consumerSample.history.push({ type: "pause", timestamp: Date.now() });
+    const onResume = () => consumerSample.history.push({ type: "resume", timestamp: Date.now() });
+    const onProducerPause = () => consumerSample.history.push({ type: "producerPaused", timestamp: Date.now() });
+    const onProducerResume = () => consumerSample.history.push({ type: "producerResumed", timestamp: Date.now() });
     consumer.observer.once("close", () => {
       consumer.observer.off("pause", onPause);
       consumer.observer.off("resume", onResume);
@@ -3576,9 +3574,7 @@ var ObservedMediasoupRouter = class extends import_events5.EventEmitter {
       protocol: dataProducer.protocol
     };
     this.sample.dataProducers.push(dataProducerSample);
-    dataProducer.observer.once("close", () => {
-      dataProducerSample.closedAt = Date.now();
-    });
+    dataProducer.observer.once("close", () => dataProducerSample.closedAt = Date.now());
   }
   addDataConsumer(transport, dataConsumer) {
     const dataConsumerSample = {
@@ -3590,14 +3586,7 @@ var ObservedMediasoupRouter = class extends import_events5.EventEmitter {
       protocol: dataConsumer.protocol
     };
     this.sample.dataConsumers.push(dataConsumerSample);
-    dataConsumer.observer.once("close", () => {
-      dataConsumerSample.closedAt = Date.now();
-    });
-  }
-  close() {
-    if (this.closed) return;
-    this.closed = true;
-    this.emit("close");
+    dataConsumer.observer.once("close", () => dataConsumerSample.closedAt = Date.now());
   }
   attachRouterListeners() {
     this.router.observer.once("close", () => {
@@ -3608,18 +3597,10 @@ var ObservedMediasoupRouter = class extends import_events5.EventEmitter {
     this.router.observer.on("newtransport", this.addTransport);
   }
   _attachTransportObserverListeners(transport, transportSample, onClose) {
-    const onNewProducer = (producer) => {
-      this.addProducer(transport, producer);
-    };
-    const onNewConsumer = (consumer) => {
-      this.addConsumer(transport, consumer);
-    };
-    const onNewDataProducer = (dataProducer) => {
-      this.addDataProducer(transport, dataProducer);
-    };
-    const onNewDataConsumer = (dataConsumer) => {
-      this.addDataConsumer(transport, dataConsumer);
-    };
+    const onNewProducer = (producer) => this.addProducer(transport, producer);
+    const onNewConsumer = (consumer) => this.addConsumer(transport, consumer);
+    const onNewDataProducer = (dataProducer) => this.addDataProducer(transport, dataProducer);
+    const onNewDataConsumer = (dataConsumer) => this.addDataConsumer(transport, dataConsumer);
     transport.observer.once("close", () => {
       transport.observer.off("newproducer", onNewProducer);
       transport.observer.off("newconsumer", onNewConsumer);
@@ -3702,7 +3683,7 @@ var Observer = class extends import_events6.EventEmitter {
       appData: settings.appData ?? this.config.createCallAppData?.({ callId: settings.callId, observer: this })
     };
     const observedCall = new ObservedCall(callSettings, this);
-    observedCall.remoteTrackResolver = this.config.createTrackResolver?.(observedCall);
+    observedCall.remoteTrackResolver = this.config.createRemoteTrackResolver?.(observedCall);
     observedCall.once("close", () => {
       this.observedCalls.delete(observedCall.callId);
       ++this.totalRemovedCall;
@@ -3729,17 +3710,19 @@ var Observer = class extends import_events6.EventEmitter {
       observedMediasoupRouter,
       observer: this
     };
-    const onPeerConnectionAdded = (observedPeerConnectionScope) => {
-      if (!observedMediasoupRouter.webrtcTransportIds.has(observedPeerConnectionScope.observedPeerConnection.peerConnectionId)) return;
-      this.emit("mediasoup-router-matched-with-peer-connection", {
-        ...observedMediasoupRouterScope,
-        ...observedPeerConnectionScope
-      });
-    };
-    const stopMatching = () => this.off("peer-connection-added", onPeerConnectionAdded);
-    this.on("peer-connection-added", onPeerConnectionAdded);
-    this.once("observer-closed", stopMatching);
-    observedMediasoupRouter.once("close", stopMatching);
+    if (settings.matchPeerConnectionByWebRtcTransportId) {
+      const onPeerConnectionAdded = (observedPeerConnectionScope) => {
+        if (!observedMediasoupRouter.webrtcTransportIds.has(observedPeerConnectionScope.observedPeerConnection.peerConnectionId)) return;
+        this.emit("mediasoup-router-matched-with-peer-connection", {
+          ...observedMediasoupRouterScope,
+          ...observedPeerConnectionScope
+        });
+      };
+      const stopMatching = () => this.off("peer-connection-added", onPeerConnectionAdded);
+      this.on("peer-connection-added", onPeerConnectionAdded);
+      this.once("observer-closed", stopMatching);
+      observedMediasoupRouter.once("close", stopMatching);
+    }
     observedMediasoupRouter.once("close", () => {
       this.observedMediasoupRouters.delete(observedMediasoupRouter.id);
       this.emit("mediasoup-router-removed", observedMediasoupRouterScope);