@fishjam-cloud/ts-client 0.7.1 → 0.7.2

package/dist/src/webrtc/CommandsQueue.d.ts

@@ -2,10 +2,10 @@ import type { Deferred } from './deferred';
 import type { LocalTrackManager } from './tracks/LocalTrackManager';
 import type { ConnectionManager } from './ConnectionManager';
 export type Command = {
-    handler: () => void;
+    handler: () => Promise<void>;
     parse?: () => void;
     resolutionNotifier: Deferred<void>;
-    resolve: 'after-renegotiation' | 'immediately';
+    resolve: 'after-renegotiation' | 'on-handler-resolve';
 };
 export declare class CommandsQueue<EndpointMetadata, TrackMetadata> {
     private readonly localTrackManager;

package/dist/src/webrtc/CommandsQueue.js

@@ -56,11 +56,12 @@ export class CommandsQueue {
         this.commandResolutionNotifier = command.resolutionNotifier;
         this.handleCommand(command);
     };
-    handleCommand = (command) => {
+    handleCommand = async (command) => {
         try {
             command.parse?.();
-            command.handler();
-            if (command.resolve === 'immediately') {
+            const promise = command.handler();
+            if (command.resolve === 'on-handler-resolve') {
+                await promise;
                 this.resolvePreviousCommand();
                 this.processNextCommand();
             }

package/dist/src/webrtc/tracks/LocalTrack.js

@@ -1,7 +1,8 @@
-import { generateCustomEvent, generateMediaEvent } from '../mediaEvent';
+import { generateCustomEvent } from '../mediaEvent';
 import { defaultBitrates, defaultSimulcastBitrates, UNLIMITED_BANDWIDTH } from '../bitrate';
 import { getEncodingParameters } from './encodings';
 import { createTransceiverConfig } from './transceivers';
+import { emitMutableEvents, getActionType } from './muteTrackUtils';
 /**
  * This is a wrapper over `TrackContext` that adds additional properties such as:
  * - `MLineId`: required to generate sdpOffer
@@ -99,6 +100,7 @@ export class LocalTrack {
     replaceTrack = async (newTrack, webrtc) => {
         const trackId = this.id;
         const stream = this.trackContext.stream;
+        const oldTrack = this.trackContext.track;
         if (!this.sender)
             throw Error('There is no RTCRtpSender for this track id!');
         stream?.getTracks().forEach((track) => {
@@ -107,25 +109,25 @@ export class LocalTrack {
         if (newTrack) {
             stream?.addTrack(newTrack);
         }
-        if (this.trackContext.track && !newTrack) {
-            const mediaEvent = generateMediaEvent('muteTrack', { trackId: trackId });
-            webrtc.sendMediaEvent(mediaEvent);
-            webrtc.emit('localTrackMuted', { trackId: trackId });
-        }
-        else if (!this.trackContext.track && newTrack) {
-            const mediaEvent = generateMediaEvent('unmuteTrack', {
-                trackId: trackId,
-            });
-            webrtc.sendMediaEvent(mediaEvent);
-            webrtc.emit('localTrackUnmuted', { trackId: trackId });
-        }
+        this.trackContext.track = newTrack;
         this.mediaStreamTrackId = newTrack?.id ?? null;
+        const action = getActionType(this.trackContext.track, newTrack);
+        if (action === 'mute' || action === 'unmute') {
+            emitMutableEvents(action, webrtc, trackId);
+        }
         try {
             await this.sender.replaceTrack(newTrack);
-            this.trackContext.track = newTrack;
         }
         catch (_error) {
-            // ignore
+            // rollback: emit opposite events and revert internal state
+            if (action === 'mute') {
+                emitMutableEvents('unmute', webrtc, trackId);
+            }
+            else if (action === 'unmute') {
+                emitMutableEvents('mute', webrtc, trackId);
+            }
+            this.trackContext.track = oldTrack;
+            this.mediaStreamTrackId = oldTrack?.id ?? null;
         }
     };
     setTrackBandwidth = (bandwidth) => {

package/dist/src/webrtc/tracks/muteTrackUtils.d.ts

@@ -0,0 +1,3 @@
+import type { WebRTCEndpoint } from '../webRTCEndpoint';
+export declare function emitMutableEvents<EndpointMetadata, TrackMetadata>(action: 'mute' | 'unmute', webrtc: WebRTCEndpoint<EndpointMetadata, TrackMetadata>, trackId: string): void;
+export declare function getActionType(currentTrack: MediaStreamTrack | null, newTrack: MediaStreamTrack | null): 'mute' | 'unmute' | 'replace';

package/dist/src/webrtc/tracks/muteTrackUtils.js

@@ -0,0 +1,19 @@
+import { generateMediaEvent } from '../mediaEvent';
+export function emitMutableEvents(action, webrtc, trackId) {
+    const mediaEventType = action === 'mute' ? `muteTrack` : `unmuteTrack`;
+    const localEventType = action === 'mute' ? `localTrackMuted` : `localTrackUnmuted`;
+    const mediaEvent = generateMediaEvent(mediaEventType, { trackId: trackId });
+    webrtc.sendMediaEvent(mediaEvent);
+    webrtc.emit(localEventType, { trackId: trackId });
+}
+export function getActionType(currentTrack, newTrack) {
+    if (currentTrack && !newTrack) {
+        return 'mute';
+    }
+    else if (!currentTrack && newTrack) {
+        return 'unmute';
+    }
+    else {
+        return 'replace';
+    }
+}

package/dist/src/webrtc/webRTCEndpoint.js

@@ -327,9 +327,7 @@ export class WebRTCEndpoint extends EventEmitter {
             metadata = parsedMetadata;
             stream.addTrack(track);
             this.commandsQueue.pushCommand({
-                handler: () => {
-                    this.localTrackManager.addTrackHandler(trackId, track, stream, parsedMetadata, simulcastConfig, maxBandwidth);
-                },
+                handler: async () => this.localTrackManager.addTrackHandler(trackId, track, stream, parsedMetadata, simulcastConfig, maxBandwidth),
                 parse: () => this.localTrackManager.parseAddTrack(track, simulcastConfig, maxBandwidth),
                 resolve: 'after-renegotiation',
                 resolutionNotifier,
@@ -397,11 +395,9 @@ export class WebRTCEndpoint extends EventEmitter {
     async replaceTrack(trackId, newTrack) {
         const resolutionNotifier = new Deferred();
         this.commandsQueue.pushCommand({
-            handler: () => {
-                this.localTrackManager.replaceTrackHandler(this, trackId, newTrack);
-            },
+            handler: () => this.localTrackManager.replaceTrackHandler(this, trackId, newTrack),
             resolutionNotifier,
-            resolve: 'immediately',
+            resolve: 'on-handler-resolve',
         });
         return resolutionNotifier.promise.then(() => {
             this.emit('localTrackReplaced', { trackId, track: newTrack });
@@ -466,9 +462,7 @@ export class WebRTCEndpoint extends EventEmitter {
     async removeTrack(trackId) {
         const resolutionNotifier = new Deferred();
         this.commandsQueue.pushCommand({
-            handler: () => {
-                this.localTrackManager.removeTrackHandler(trackId);
-            },
+            handler: async () => this.localTrackManager.removeTrackHandler(trackId),
             resolutionNotifier,
             resolve: 'after-renegotiation',
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fishjam-cloud/ts-client",
-  "version": "0.7.1",
+  "version": "0.7.2",
   "description": "Typescript client library for Fishjam Cloud",
   "license": "Apache-2.0",
   "author": "Fishjam Cloud Team",
@@ -53,20 +53,20 @@
   "devDependencies": {
     "@playwright/test": "^1.47.2",
     "@types/events": "^3.0.3",
-    "@types/node": "^22.7.4",
+    "@types/node": "^22.7.5",
     "@types/uuid": "^10.0.0",
-    "@vitest/coverage-v8": "^2.1.1",
+    "@vitest/coverage-v8": "^2.1.2",
     "fake-mediastreamtrack": "^1.2.0",
     "husky": "^9.1.6",
     "lint-staged": "^15.2.10",
     "react": "^18.2.0",
-    "ts-proto": "^2.2.1",
+    "ts-proto": "^2.2.3",
     "typed-emitter": "^2.1.0",
-    "typedoc": "^0.26.7",
+    "typedoc": "^0.26.8",
     "typedoc-plugin-external-resolver": "^1.0.3",
     "typedoc-plugin-mdn-links": "^3.3.2",
     "typescript": "^5.6.2",
-    "vitest": "^2.1.1",
+    "vitest": "^2.1.2",
     "zod": "^3.23.6"
   },
   "lint-staged": {