@fishjam-cloud/ts-client 0.8.0 → 0.9.0

package/dist/src/FishjamClient.d.ts

@@ -315,7 +315,6 @@ export declare class FishjamClient<PeerMetadata, TrackMetadata> extends FishjamC
      * ```
      *
      * @param track - Audio or video track e.g. from your microphone or camera.
-     * @param stream - Stream that this track belongs to.
      * @param trackMetadata - Any information about this track that other peers will receive in
      * {@link MessageEvents.peerJoined}. E.g. this can source of the track - wheather it's screensharing, webcam or some
      * other media device.
@@ -462,7 +461,7 @@ export declare class FishjamClient<PeerMetadata, TrackMetadata> extends FishjamC
      * ```
      *
      * @param {string} trackId - Id of track
-     * @param {rackEncoding} encoding - Encoding that will be disabled
+     * @param {Encoding} encoding - Encoding that will be disabled
      */
     disableTrackEncoding(trackId: string, encoding: Encoding): Promise<void>;
     /**

package/dist/src/FishjamClient.js

@@ -5,7 +5,7 @@ import { ReconnectManager } from './reconnection';
 import { isAuthError } from './auth';
 import { connectEventsHandler } from './connectEventsHandler';
 const STATISTICS_INTERVAL = 10_000;
-const isPeer = (endpoint) => endpoint.type === 'webrtc';
+const isPeer = (endpoint) => endpoint.type === 'webrtc' || endpoint.type === 'exwebrtc';
 const isComponent = (endpoint) => endpoint.type === 'recording' ||
     endpoint.type === 'hls' ||
     endpoint.type === 'file' ||
@@ -400,7 +400,6 @@ export class FishjamClient extends EventEmitter {
      * ```
      *
      * @param track - Audio or video track e.g. from your microphone or camera.
-     * @param stream - Stream that this track belongs to.
      * @param trackMetadata - Any information about this track that other peers will receive in
      * {@link MessageEvents.peerJoined}. E.g. this can source of the track - wheather it's screensharing, webcam or some
      * other media device.
@@ -581,7 +580,7 @@ export class FishjamClient extends EventEmitter {
      * ```
      *
      * @param {string} trackId - Id of track
-     * @param {rackEncoding} encoding - Encoding that will be disabled
+     * @param {Encoding} encoding - Encoding that will be disabled
      */
     disableTrackEncoding(trackId, encoding) {
         if (!this.webrtc)

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

@@ -8,6 +8,7 @@ export type TurnServer = {
 };
 export declare class ConnectionManager {
     private readonly connection;
+    readonly isExWebRTC: boolean;
     constructor(turnServers: TurnServer[]);
     isConnectionUnstable: () => boolean;
     /**

package/dist/src/webrtc/ConnectionManager.js

@@ -1,10 +1,16 @@
 export class ConnectionManager {
     connection;
+    isExWebRTC;
     constructor(turnServers) {
+        this.isExWebRTC = turnServers.length === 0;
+        const iceServers = this.isExWebRTC
+            ? [{ urls: 'stun:stun.l.google.com:19302' }, { urls: 'stun:stun.l.google.com:5349' }]
+            : this.getIceServers(turnServers);
+        const iceTransportPolicy = this.isExWebRTC ? 'all' : 'relay';
         this.connection = new RTCPeerConnection({
             bundlePolicy: 'max-bundle',
-            iceServers: this.getIceServers(turnServers),
-            iceTransportPolicy: 'relay',
+            iceServers: iceServers,
+            iceTransportPolicy: iceTransportPolicy,
         });
     }
     isConnectionUnstable = () => {

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

@@ -229,10 +229,16 @@ export class Local {
         }), {});
     };
     getTrackIdToTrackBitrates = () => {
-        return Object.values(this.localTracks).reduce((previousValue, localTrack) => ({
-            ...previousValue,
-            [localTrack.id]: localTrack.getTrackBitrates(),
-        }), {});
+        return Object.values(this.localTracks).reduce((previousValue, localTrack) => {
+            const bitrates = localTrack.getTrackBitrates();
+            if (bitrates) {
+                return {
+                    ...previousValue,
+                    [localTrack.id]: bitrates,
+                };
+            }
+            return previousValue;
+        }, {});
     };
     getMidToTrackId = () => {
         if (!this.connection)

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

@@ -54,9 +54,8 @@ export declare class LocalTrack<EndpointMetadata, TrackMetadata> implements Trac
     setEncodingBandwidth(rid: Encoding, bandwidth: BandwidthLimit): Promise<void>;
     updateTrackMetadata: (metadata: unknown) => void;
     enableTrackEncoding: (encoding: Encoding) => Promise<void>;
-    getDisabledEncodings: () => Encoding[];
     setMLineId: (mLineId: MLineId) => void;
     private isNotSimulcastTrack;
-    getTrackBitrates: () => Bitrates;
+    getTrackBitrates: () => Bitrates | undefined;
     createTrackVariantBitratesEvent: () => import("..").MediaEvent;
 }

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

@@ -81,7 +81,6 @@ export class LocalTrack {
         this.updateEncodings();
         this.connection.addTransceiver(this.trackContext.track, transceiverConfig);
     };
-    // 1
     updateEncodings = () => {
         if (this.trackContext?.track?.kind === 'video' && this.trackContext.simulcastConfig?.activeEncodings) {
             const activeEncodings = this.trackContext.simulcastConfig.activeEncodings;
@@ -177,12 +176,6 @@ export class LocalTrack {
         this.encodings[encoding] = true;
         return this.sender.setParameters(params);
     };
-    getDisabledEncodings = () => {
-        return Object.entries(this.encodings)
-            .filter(([_, value]) => !value)
-            .map(([encoding]) => encoding)
-            .reduce((acc, encoding) => [...acc, encoding], []);
-    };
     setMLineId = (mLineId) => {
         this.mLineId = mLineId;
     };
@@ -197,7 +190,7 @@ export class LocalTrack {
             return defaultBitrates[trackContext.trackKind];
         }
         if (!this.sender)
-            throw new Error(`RTCRtpSender for track ${this.id} not found`);
+            return undefined;
         const encodings = this.sender.getParameters().encodings;
         if (this.isNotSimulcastTrack(encodings)) {
             return encodings[0].maxBitrate || (kind ? defaultBitrates[kind] : UNLIMITED_BANDWIDTH);

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

@@ -18,7 +18,7 @@ export declare class Remote<EndpointMetadata, TrackMetadata> {
     getTrackByMid: (mid: string) => RemoteTrack<EndpointMetadata, TrackMetadata>;
     addTracks: (endpointId: EndpointId, tracks: Record<TrackId, SDPTrack>, trackIdToMetadata: Record<TrackId, any>) => void;
     removeTracks: (trackIds: TrackId[]) => void;
-    removeRemoteTrack: (trackId: TrackId) => void;
+    private removeRemoteTrack;
     addRemoteEndpoint: (endpoint: any, sendNotification?: boolean) => void;
     private addEndpoint;
     updateRemoteEndpoint: (data: any) => void;

package/dist/src/webrtc/webRTCEndpoint.js

@@ -159,8 +159,8 @@ export class WebRTCEndpoint extends EventEmitter {
                 break;
             }
             case 'sdpAnswer':
-                await this.onSdpAnswer(deserializedMediaEvent.data);
                 this.localTrackManager.ongoingRenegotiation = false;
+                await this.onSdpAnswer(deserializedMediaEvent.data);
                 this.commandsQueue.processNextCommand();
                 break;
             case 'candidate':
@@ -215,6 +215,9 @@ export class WebRTCEndpoint extends EventEmitter {
                 await this.handleMediaEvent(deserializedMediaEvent.data);
                 break;
             case 'error':
+                console.warn('signaling error', {
+                    message: deserializedMediaEvent.data.message,
+                });
                 this.emit('signalingError', {
                     message: deserializedMediaEvent.data.message,
                 });
@@ -575,6 +578,7 @@ export class WebRTCEndpoint extends EventEmitter {
         if (!connection)
             return;
         try {
+            this.localTrackManager.updateSenders();
             const offer = await connection.getConnection().createOffer();
             if (!this.connectionManager) {
                 console.warn('RTCPeerConnection stopped or restarted');
@@ -595,10 +599,10 @@ export class WebRTCEndpoint extends EventEmitter {
     }
     onOfferData = async (offerData) => {
         const connection = this.connectionManager;
-        if (connection) {
+        if (connection && !connection.isExWebRTC) {
             connection.getConnection().restartIce();
         }
-        else {
+        else if (!connection) {
             this.setConnection(offerData.data.integratedTurnServers);
             const onIceCandidate = (event) => this.onLocalCandidate(event);
             const onIceCandidateError = (event) => this.onIceCandidateError(event);
@@ -620,7 +624,6 @@ export class WebRTCEndpoint extends EventEmitter {
             this.commandsQueue.initConnection(connection);
             this.local.addAllTracksToConnection();
         }
-        this.localTrackManager.updateSenders();
         const tracks = new Map(Object.entries(offerData.data.tracksTypes));
         this.connectionManager?.addTransceiversIfNeeded(tracks);
         await this.createAndSendOffer();
@@ -649,6 +652,8 @@ export class WebRTCEndpoint extends EventEmitter {
                 data: {
                     candidate: event.candidate.candidate,
                     sdpMLineIndex: event.candidate.sdpMLineIndex,
+                    sdpMid: event.candidate.sdpMid,
+                    usernameFragment: event.candidate.usernameFragment,
                 },
             });
             this.sendMediaEvent(mediaEvent);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fishjam-cloud/ts-client",
-  "version": "0.8.0",
+  "version": "0.9.0",
   "description": "Typescript client library for Fishjam Cloud",
   "license": "Apache-2.0",
   "author": "Fishjam Cloud Team",
@@ -45,10 +45,10 @@
     "prepack": "yarn build"
   },
   "dependencies": {
+    "@bufbuild/protobuf": "^2.2.0",
     "events": "^3.3.0",
-    "protobufjs": "^7.3.0",
     "typed-emitter": "^2.1.0",
-    "uuid": "^10.0.0"
+    "uuid": "^11.0.2"
   },
   "devDependencies": {
     "@playwright/test": "^1.47.2",
@@ -59,8 +59,6 @@
     "fake-mediastreamtrack": "^1.2.0",
     "husky": "^9.1.6",
     "lint-staged": "^15.2.10",
-    "react": "^18.2.0",
-    "ts-proto": "^2.2.3",
     "typed-emitter": "^2.1.0",
     "typedoc": "^0.26.8",
     "typedoc-plugin-external-resolver": "^1.0.3",