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

package/dist/index.mjs

@@ -3289,12 +3289,9 @@ import { EventEmitter as EventEmitter5 } from "events";
 var logger6 = createLogger("ObservedMediasoupRouter");
 var ObservedMediasoupRouter = class extends EventEmitter5 {
   router;
-  sample;
   appData;
+  sample;
   webrtcTransportIds = /* @__PURE__ */ new Set();
-  get attachments() {
-    return this.sample.attachments;
-  }
   closed = false;
   constructor(settings) {
     super();
@@ -3315,6 +3312,15 @@ var ObservedMediasoupRouter = class extends EventEmitter5 {
   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) {
@@ -3347,35 +3353,17 @@ var ObservedMediasoupRouter = class extends EventEmitter5 {
       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);
@@ -3387,7 +3375,6 @@ var ObservedMediasoupRouter = class extends EventEmitter5 {
     transport.observer.on("iceselectedtuplechange", onIceSelectedTupleChange);
     transport.observer.on("dtlsstatechange", onDtlsStateChange);
     transport.observer.on("sctpstatechange", onSctpStateChange);
-    this.webrtcTransportIds.add(transport.id);
   }
   addPlainTransport(transport) {
     const history = [];
@@ -3410,13 +3397,8 @@ var ObservedMediasoupRouter = class extends EventEmitter5 {
       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);
@@ -3438,13 +3420,8 @@ var ObservedMediasoupRouter = class extends EventEmitter5 {
     };
     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);
@@ -3457,7 +3434,6 @@ var ObservedMediasoupRouter = class extends EventEmitter5 {
       id: transport.id,
       type: "direct",
       createdAt: now,
-      // A DirectTransport has no network layer — it is connected the instant it exists.
       connectedAt: now,
       history: []
     };
@@ -3466,37 +3442,26 @@ var ObservedMediasoupRouter = class extends EventEmitter5 {
   }
   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);
@@ -3515,30 +3480,10 @@ var ObservedMediasoupRouter = class extends EventEmitter5 {
       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);
@@ -3560,9 +3505,7 @@ var ObservedMediasoupRouter = class extends EventEmitter5 {
       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 = {
@@ -3574,14 +3517,7 @@ var ObservedMediasoupRouter = class extends EventEmitter5 {
       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", () => {
@@ -3592,18 +3528,10 @@ var ObservedMediasoupRouter = class extends EventEmitter5 {
     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);
@@ -3686,7 +3614,7 @@ var Observer = class extends EventEmitter6 {
       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;