Channel: move some ids from internal object to data object (#847)

versatica · Jun 29, 2022 · f23ecea · f23ecea
1 parent a63de49
commit f23ecea
Show file tree

Hide file tree

Showing 19 changed files with 114 additions and 59 deletions.
diff --git a/node/lib/Consumer.js b/node/lib/Consumer.js
@@ -58,7 +58,7 @@ class Consumer extends EnhancedEventEmitter_1.EnhancedEventEmitter {
      * Associated Producer id.
      */
     get producerId() {
-        return this.#internal.producerId;
+        return this.#data.producerId;
     }
     /**
      * Whether the Consumer is closed.

diff --git a/node/lib/DataConsumer.js b/node/lib/DataConsumer.js
@@ -42,7 +42,7 @@ class DataConsumer extends EnhancedEventEmitter_1.EnhancedEventEmitter {
      * Associated DataProducer id.
      */
     get dataProducerId() {
-        return this.#internal.dataProducerId;
+        return this.#data.dataProducerId;
     }
     /**
      * Whether the DataConsumer is closed.

diff --git a/node/lib/PipeTransport.d.ts.map b/node/lib/PipeTransport.d.ts.map
diff --git a/node/lib/PipeTransport.js b/node/lib/PipeTransport.js
@@ -113,15 +113,21 @@ class PipeTransport extends Transport_1.Transport {
             throw Error(`Producer with id "${producerId}" not found`);
         // This may throw.
         const rtpParameters = ortc.getPipeConsumerRtpParameters(producer.consumableRtpParameters, this.#data.rtx);
-        const internal = { ...this.internal, consumerId: (0, uuid_1.v4)(), producerId };
+        const internal = { ...this.internal, consumerId: (0, uuid_1.v4)() };
         const reqData = {
+            producerId,
             kind: producer.kind,
             rtpParameters,
             type: 'pipe',
             consumableRtpEncodings: producer.consumableRtpParameters.encodings
         };
         const status = await this.channel.request('transport.consume', internal, reqData);
-        const data = { kind: producer.kind, rtpParameters, type: 'pipe' };
+        const data = {
+            producerId,
+            kind: producer.kind,
+            rtpParameters,
+            type: 'pipe'
+        };
         const consumer = new Consumer_1.Consumer({
             internal,
             data,

diff --git a/node/lib/Router.d.ts.map b/node/lib/Router.d.ts.map
diff --git a/node/lib/Router.js b/node/lib/Router.js
@@ -188,10 +188,10 @@ class Router extends EnhancedEventEmitter_1.EnhancedEventEmitter {
         }
         const internal = {
             ...this.#internal,
-            transportId: (0, uuid_1.v4)(),
-            webRtcServerId: webRtcServer ? webRtcServer.id : undefined
+            transportId: (0, uuid_1.v4)()
         };
         const reqData = {
+            webRtcServerId: webRtcServer ? webRtcServer.id : undefined,
             listenIps,
             port,
             enableUdp,