@fishjam-cloud/webrtc-client 0.27.0-rc.0 → 0.28.0

package/dist/index.mjs

@@ -1441,7 +1441,7 @@ var CommandsQueue = class {
     connection.getConnection().addEventListener("signalingstatechange", onSignalingStateChange);
   };
   commandsQueue = [];
-  commandResolutionNotifier = null;
+  commandResolutionNotifiers = [];
   pushCommand = (command) => {
     this.commandsQueue.push(command);
     this.processNextCommand();
@@ -1449,35 +1449,53 @@ var CommandsQueue = class {
   processNextCommand = () => {
     if (this.localTrackManager.isNegotiationInProgress()) return;
     if (this.connection?.isConnectionUnstable()) return;
-    this.resolvePreviousCommand();
+    this.resolvePreviousCommands();
     const command = this.commandsQueue.shift();
     if (!command) return;
-    this.commandResolutionNotifier = command.resolutionNotifier;
+    this.commandResolutionNotifiers.push(command.resolutionNotifier);
     this.handleCommand(command);
   };
+  /**
+   * Drains queued batchable commands into the in-flight negotiation (called from `onOfferData`,
+   * before the offer is created). Ignores `isNegotiationInProgress` by design; stops at the first
+   * non-batchable command to preserve ordering.
+   */
+  processBatchedCommands = () => {
+    if (this.connection?.isConnectionUnstable()) return;
+    while (this.commandsQueue[0]?.batchable) {
+      const command = this.commandsQueue.shift();
+      this.commandResolutionNotifiers.push(command.resolutionNotifier);
+      this.handleCommand(command);
+    }
+  };
   handleCommand = async (command) => {
     try {
       command.parse?.();
-      const promise = command.handler();
+      await command.handler();
       if (command.resolve === "on-handler-resolve") {
-        await promise;
-        this.resolvePreviousCommand();
+        this.resolveCommand(command.resolutionNotifier);
         this.processNextCommand();
       }
     } catch (error) {
-      this.commandResolutionNotifier?.reject(error);
-      this.commandResolutionNotifier = null;
+      this.rejectCommand(command.resolutionNotifier, error);
       this.processNextCommand();
     }
   };
-  resolvePreviousCommand = () => {
-    if (!this.commandResolutionNotifier) return;
-    this.commandResolutionNotifier.resolve();
-    this.commandResolutionNotifier = null;
+  resolvePreviousCommands = () => {
+    this.commandResolutionNotifiers.forEach((notifier) => notifier.resolve());
+    this.commandResolutionNotifiers = [];
+  };
+  resolveCommand = (notifier) => {
+    notifier.resolve();
+    this.commandResolutionNotifiers = this.commandResolutionNotifiers.filter((current) => current !== notifier);
+  };
+  rejectCommand = (notifier, error) => {
+    notifier.reject(error);
+    this.commandResolutionNotifiers = this.commandResolutionNotifiers.filter((current) => current !== notifier);
   };
   cleanUp = () => {
-    this.commandResolutionNotifier?.reject("Disconnected");
-    this.commandResolutionNotifier = null;
+    this.commandResolutionNotifiers.forEach((notifier) => notifier.reject("Disconnected"));
+    this.commandResolutionNotifiers = [];
     this.commandsQueue = [];
     this.clearConnectionCallbacks?.();
   };
@@ -4520,6 +4538,7 @@ var LocalTrackManager = class {
     }
   };
   addTrackHandler = (trackId, track, stream, trackMetadata, simulcastConfig, maxBandwidth) => {
+    const isRenegotiationAlreadyPending = this.ongoingRenegotiation;
     this.ongoingRenegotiation = true;
     const trackManager = this.local.addTrack(
       this.connection,
@@ -4533,7 +4552,9 @@ var LocalTrackManager = class {
     if (this.connection) {
       trackManager.addTrackToConnection();
     }
-    this.sendMediaEvent({ renegotiateTracks: MediaEvent_RenegotiateTracks.create() });
+    if (!isRenegotiationAlreadyPending) {
+      this.sendMediaEvent({ renegotiateTracks: MediaEvent_RenegotiateTracks.create() });
+    }
   };
   removeTrackHandler = (trackId) => {
     if (!this.connection) throw new Error(`There is no active RTCPeerConnection`);
@@ -5073,7 +5094,8 @@ var WebRTCEndpoint = class extends EventEmitter3 {
         ),
         parse: () => this.localTrackManager.parseAddTrack(track, simulcastConfig, resolvedMaxBandwidth),
         resolve: "after-renegotiation",
-        resolutionNotifier
+        resolutionNotifier,
+        batchable: true
       });
     } catch (error) {
       resolutionNotifier.reject(error);
@@ -5386,6 +5408,7 @@ var WebRTCEndpoint = class extends EventEmitter3 {
     if (offerData.tracksTypes) {
       connectionManager.addTransceiversIfNeeded(offerData.tracksTypes);
     }
+    this.commandsQueue.processBatchedCommands();
     await this.createAndSendOffer();
   };
   setupConnectionListeners = (connection) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fishjam-cloud/webrtc-client",
-  "version": "0.27.0-rc.0",
+  "version": "0.28.0",
   "description": "Typescript client library for ExWebRTC/WebRTC endpoint in Membrane RTC Engine",
   "license": "Apache-2.0",
   "author": "Fishjam Team",
@@ -50,7 +50,7 @@
   },
   "devDependencies": {
     "@faker-js/faker": "^9.6.0",
-    "@fishjam-cloud/protobufs": "0.27.0-rc.0",
+    "@fishjam-cloud/protobufs": "0.28.0",
     "@playwright/test": "^1.51.1",
     "@types/events": "^3.0.3",
     "@types/node": "^22.14.0",
@@ -75,6 +75,5 @@
     "*.(js|ts|tsx)": [
       "yarn lint"
     ]
-  },
-  "stableVersion": "0.26.3"
+  }
 }