@whereby.com/assistant-sdk 1.2.112 → 1.2.114

package/dist/index.cjs

@@ -53,14 +53,10 @@ const { nonstandard: { RTCAudioSink, RTCAudioSource }, } = wrtc;
 class AudioSource extends RTCAudioSource {
 }
 class AudioSink extends RTCAudioSink {
-    constructor(track) {
-        super(track);
-        this._sink = new RTCAudioSink(track);
-    }
     subscribe(cb) {
-        this._sink.ondata = cb;
+        this.ondata = cb;
         return () => {
-            this._sink.ondata = undefined;
+            this.ondata = undefined;
         };
     }
 }
@@ -517,6 +513,8 @@ class AudioMixer extends EventEmitter.EventEmitter {
         this.mixableSlots.set(slot, "");
     }
     getCombinedAudioStream() {
+        if (!this.combinedAudioStream)
+            this.setupMediaStream();
         return this.combinedAudioStream;
     }
     handleRemoteParticipants(participants) {
@@ -527,6 +525,8 @@ class AudioMixer extends EventEmitter.EventEmitter {
             if (pid && !liveIds.has(pid))
                 this.detachMixable(pid);
         }
+        if (!this.rtcAudioSource)
+            this.setupMediaStream();
         if (!this.ffmpegProcess && this.rtcAudioSource) {
             this.ffmpegProcess = DEBUG_MIXER_OUTPUT
                 ? this.mixer.spawnFFmpegProcessDebug(this.rtcAudioSource)
@@ -548,6 +548,8 @@ class AudioMixer extends EventEmitter.EventEmitter {
         if (screensharesWithAudio.length === 0) {
             return;
         }
+        if (!this.rtcAudioSource)
+            this.setupMediaStream();
         if (!this.ffmpegProcess && this.rtcAudioSource) {
             this.ffmpegProcess = DEBUG_MIXER_OUTPUT
                 ? this.mixer.spawnFFmpegProcessDebug(this.rtcAudioSource)
@@ -562,14 +564,27 @@ class AudioMixer extends EventEmitter.EventEmitter {
             this.attachMixableIfNeeded(Object.assign(Object.assign({}, s), { type: "screenshare" }));
     }
     stopAudioMixer() {
+        var _a;
+        for (const binding of Object.values(this.activeSlots)) {
+            if (!binding)
+                continue;
+            try {
+                binding.stop();
+            }
+            catch (e) {
+                console.error("Failed to stop existing audio track", { error: e });
+            }
+        }
+        (_a = this.combinedAudioStream) === null || _a === void 0 ? void 0 : _a.getTracks().forEach((track) => track.stop());
         if (this.ffmpegProcess) {
             this.mixer.stopFFmpegProcess(this.ffmpegProcess);
             this.ffmpegProcess = null;
         }
         this.mixableSlots = new Map(Array.from({ length: MIXER_SLOTS }, (_, i) => [i, ""]));
         this.activeSlots = {};
-        // Recreate the media stream to avoid stale references
-        this.setupMediaStream();
+        // The media stream is recreated lazily if the mixer is used again
+        this.combinedAudioStream = null;
+        this.rtcAudioSource = null;
     }
 }
 
@@ -592,6 +607,7 @@ class VideoSink extends RTCVideoSink {
 class Assistant extends EventEmitter {
     constructor({ assistantKey }) {
         super();
+        this.audioMixer = null;
         this.combinedAudioSink = null;
         this.remoteMediaTracks = {};
         this.roomUrl = null;
@@ -602,6 +618,8 @@ class Assistant extends EventEmitter {
             }
             if (["left", "kicked"].includes(status)) {
                 this.stateSubscriptions.forEach((unsubscribe) => unsubscribe());
+                this.stateSubscriptions = [];
+                this.stopCombinedAudio();
                 this.emit(ASSISTANT_LEFT_ROOM, { roomUrl: this.roomUrl || "" });
             }
         };
@@ -713,12 +731,21 @@ class Assistant extends EventEmitter {
         const stream = audioMixer.getCombinedAudioStream();
         const audioTracks = stream === null || stream === void 0 ? void 0 : stream.getAudioTracks();
         if (audioTracks === null || audioTracks === void 0 ? void 0 : audioTracks.length) {
+            this.audioMixer = audioMixer;
             this.combinedAudioSink = new AudioSink(audioTracks[0]);
             this.stateSubscriptions.push(this.roomConnection.subscribeToRemoteParticipants(audioMixer.handleRemoteParticipants.bind(audioMixer)));
             return this.combinedAudioSink;
         }
+        audioMixer.stopAudioMixer();
         return null;
     }
+    stopCombinedAudio() {
+        var _a, _b;
+        (_a = this.combinedAudioSink) === null || _a === void 0 ? void 0 : _a.stop();
+        this.combinedAudioSink = null;
+        (_b = this.audioMixer) === null || _b === void 0 ? void 0 : _b.stopAudioMixer();
+        this.audioMixer = null;
+    }
 }
 
 function buildRoomUrl(roomPath, wherebySubdomain, baseDomain = "whereby.com") {

package/dist/index.d.cts

@@ -127,8 +127,6 @@ declare const RTCAudioSource: {
 declare class AudioSource extends RTCAudioSource {
 }
 declare class AudioSink extends RTCAudioSink {
-    private _sink;
-    constructor(track: MediaStreamTrack);
     subscribe(cb: (d: {
         samples: Int16Array;
         sampleRate: number;
@@ -179,6 +177,7 @@ declare class Assistant extends EventEmitter<AssistantEvents> {
     private client;
     private roomConnection;
     private localMedia;
+    private audioMixer;
     private combinedAudioSink;
     private remoteMediaTracks;
     private roomUrl;
@@ -195,6 +194,7 @@ declare class Assistant extends EventEmitter<AssistantEvents> {
     stopLocalMedia(): void;
     getLocalMedia(): LocalMediaClient;
     getCombinedAudioSink(): AudioSink | null;
+    private stopCombinedAudio;
 }
 
 interface TriggerOptions {

package/dist/index.d.mts

@@ -127,8 +127,6 @@ declare const RTCAudioSource: {
 declare class AudioSource extends RTCAudioSource {
 }
 declare class AudioSink extends RTCAudioSink {
-    private _sink;
-    constructor(track: MediaStreamTrack);
     subscribe(cb: (d: {
         samples: Int16Array;
         sampleRate: number;
@@ -179,6 +177,7 @@ declare class Assistant extends EventEmitter<AssistantEvents> {
     private client;
     private roomConnection;
     private localMedia;
+    private audioMixer;
     private combinedAudioSink;
     private remoteMediaTracks;
     private roomUrl;
@@ -195,6 +194,7 @@ declare class Assistant extends EventEmitter<AssistantEvents> {
     stopLocalMedia(): void;
     getLocalMedia(): LocalMediaClient;
     getCombinedAudioSink(): AudioSink | null;
+    private stopCombinedAudio;
 }
 
 interface TriggerOptions {

package/dist/index.d.ts

@@ -127,8 +127,6 @@ declare const RTCAudioSource: {
 declare class AudioSource extends RTCAudioSource {
 }
 declare class AudioSink extends RTCAudioSink {
-    private _sink;
-    constructor(track: MediaStreamTrack);
     subscribe(cb: (d: {
         samples: Int16Array;
         sampleRate: number;
@@ -179,6 +177,7 @@ declare class Assistant extends EventEmitter<AssistantEvents> {
     private client;
     private roomConnection;
     private localMedia;
+    private audioMixer;
     private combinedAudioSink;
     private remoteMediaTracks;
     private roomUrl;
@@ -195,6 +194,7 @@ declare class Assistant extends EventEmitter<AssistantEvents> {
     stopLocalMedia(): void;
     getLocalMedia(): LocalMediaClient;
     getCombinedAudioSink(): AudioSink | null;
+    private stopCombinedAudio;
 }
 
 interface TriggerOptions {

package/dist/index.mjs

@@ -51,14 +51,10 @@ const { nonstandard: { RTCAudioSink, RTCAudioSource }, } = wrtc;
 class AudioSource extends RTCAudioSource {
 }
 class AudioSink extends RTCAudioSink {
-    constructor(track) {
-        super(track);
-        this._sink = new RTCAudioSink(track);
-    }
     subscribe(cb) {
-        this._sink.ondata = cb;
+        this.ondata = cb;
         return () => {
-            this._sink.ondata = undefined;
+            this.ondata = undefined;
         };
     }
 }
@@ -515,6 +511,8 @@ class AudioMixer extends EventEmitter {
         this.mixableSlots.set(slot, "");
     }
     getCombinedAudioStream() {
+        if (!this.combinedAudioStream)
+            this.setupMediaStream();
         return this.combinedAudioStream;
     }
     handleRemoteParticipants(participants) {
@@ -525,6 +523,8 @@ class AudioMixer extends EventEmitter {
             if (pid && !liveIds.has(pid))
                 this.detachMixable(pid);
         }
+        if (!this.rtcAudioSource)
+            this.setupMediaStream();
         if (!this.ffmpegProcess && this.rtcAudioSource) {
             this.ffmpegProcess = DEBUG_MIXER_OUTPUT
                 ? this.mixer.spawnFFmpegProcessDebug(this.rtcAudioSource)
@@ -546,6 +546,8 @@ class AudioMixer extends EventEmitter {
         if (screensharesWithAudio.length === 0) {
             return;
         }
+        if (!this.rtcAudioSource)
+            this.setupMediaStream();
         if (!this.ffmpegProcess && this.rtcAudioSource) {
             this.ffmpegProcess = DEBUG_MIXER_OUTPUT
                 ? this.mixer.spawnFFmpegProcessDebug(this.rtcAudioSource)
@@ -560,14 +562,27 @@ class AudioMixer extends EventEmitter {
             this.attachMixableIfNeeded(Object.assign(Object.assign({}, s), { type: "screenshare" }));
     }
     stopAudioMixer() {
+        var _a;
+        for (const binding of Object.values(this.activeSlots)) {
+            if (!binding)
+                continue;
+            try {
+                binding.stop();
+            }
+            catch (e) {
+                console.error("Failed to stop existing audio track", { error: e });
+            }
+        }
+        (_a = this.combinedAudioStream) === null || _a === void 0 ? void 0 : _a.getTracks().forEach((track) => track.stop());
         if (this.ffmpegProcess) {
             this.mixer.stopFFmpegProcess(this.ffmpegProcess);
             this.ffmpegProcess = null;
         }
         this.mixableSlots = new Map(Array.from({ length: MIXER_SLOTS }, (_, i) => [i, ""]));
         this.activeSlots = {};
-        // Recreate the media stream to avoid stale references
-        this.setupMediaStream();
+        // The media stream is recreated lazily if the mixer is used again
+        this.combinedAudioStream = null;
+        this.rtcAudioSource = null;
     }
 }
 
@@ -590,6 +605,7 @@ class VideoSink extends RTCVideoSink {
 class Assistant extends EventEmitter$1 {
     constructor({ assistantKey }) {
         super();
+        this.audioMixer = null;
         this.combinedAudioSink = null;
         this.remoteMediaTracks = {};
         this.roomUrl = null;
@@ -600,6 +616,8 @@ class Assistant extends EventEmitter$1 {
             }
             if (["left", "kicked"].includes(status)) {
                 this.stateSubscriptions.forEach((unsubscribe) => unsubscribe());
+                this.stateSubscriptions = [];
+                this.stopCombinedAudio();
                 this.emit(ASSISTANT_LEFT_ROOM, { roomUrl: this.roomUrl || "" });
             }
         };
@@ -711,12 +729,21 @@ class Assistant extends EventEmitter$1 {
         const stream = audioMixer.getCombinedAudioStream();
         const audioTracks = stream === null || stream === void 0 ? void 0 : stream.getAudioTracks();
         if (audioTracks === null || audioTracks === void 0 ? void 0 : audioTracks.length) {
+            this.audioMixer = audioMixer;
             this.combinedAudioSink = new AudioSink(audioTracks[0]);
             this.stateSubscriptions.push(this.roomConnection.subscribeToRemoteParticipants(audioMixer.handleRemoteParticipants.bind(audioMixer)));
             return this.combinedAudioSink;
         }
+        audioMixer.stopAudioMixer();
         return null;
     }
+    stopCombinedAudio() {
+        var _a, _b;
+        (_a = this.combinedAudioSink) === null || _a === void 0 ? void 0 : _a.stop();
+        this.combinedAudioSink = null;
+        (_b = this.audioMixer) === null || _b === void 0 ? void 0 : _b.stopAudioMixer();
+        this.audioMixer = null;
+    }
 }
 
 function buildRoomUrl(roomPath, wherebySubdomain, baseDomain = "whereby.com") {

package/dist/legacy-esm.js

@@ -51,14 +51,10 @@ const { nonstandard: { RTCAudioSink, RTCAudioSource }, } = wrtc;
 class AudioSource extends RTCAudioSource {
 }
 class AudioSink extends RTCAudioSink {
-    constructor(track) {
-        super(track);
-        this._sink = new RTCAudioSink(track);
-    }
     subscribe(cb) {
-        this._sink.ondata = cb;
+        this.ondata = cb;
         return () => {
-            this._sink.ondata = undefined;
+            this.ondata = undefined;
         };
     }
 }
@@ -515,6 +511,8 @@ class AudioMixer extends EventEmitter {
         this.mixableSlots.set(slot, "");
     }
     getCombinedAudioStream() {
+        if (!this.combinedAudioStream)
+            this.setupMediaStream();
         return this.combinedAudioStream;
     }
     handleRemoteParticipants(participants) {
@@ -525,6 +523,8 @@ class AudioMixer extends EventEmitter {
             if (pid && !liveIds.has(pid))
                 this.detachMixable(pid);
         }
+        if (!this.rtcAudioSource)
+            this.setupMediaStream();
         if (!this.ffmpegProcess && this.rtcAudioSource) {
             this.ffmpegProcess = DEBUG_MIXER_OUTPUT
                 ? this.mixer.spawnFFmpegProcessDebug(this.rtcAudioSource)
@@ -546,6 +546,8 @@ class AudioMixer extends EventEmitter {
         if (screensharesWithAudio.length === 0) {
             return;
         }
+        if (!this.rtcAudioSource)
+            this.setupMediaStream();
         if (!this.ffmpegProcess && this.rtcAudioSource) {
             this.ffmpegProcess = DEBUG_MIXER_OUTPUT
                 ? this.mixer.spawnFFmpegProcessDebug(this.rtcAudioSource)
@@ -560,14 +562,27 @@ class AudioMixer extends EventEmitter {
             this.attachMixableIfNeeded(Object.assign(Object.assign({}, s), { type: "screenshare" }));
     }
     stopAudioMixer() {
+        var _a;
+        for (const binding of Object.values(this.activeSlots)) {
+            if (!binding)
+                continue;
+            try {
+                binding.stop();
+            }
+            catch (e) {
+                console.error("Failed to stop existing audio track", { error: e });
+            }
+        }
+        (_a = this.combinedAudioStream) === null || _a === void 0 ? void 0 : _a.getTracks().forEach((track) => track.stop());
         if (this.ffmpegProcess) {
             this.mixer.stopFFmpegProcess(this.ffmpegProcess);
             this.ffmpegProcess = null;
         }
         this.mixableSlots = new Map(Array.from({ length: MIXER_SLOTS }, (_, i) => [i, ""]));
         this.activeSlots = {};
-        // Recreate the media stream to avoid stale references
-        this.setupMediaStream();
+        // The media stream is recreated lazily if the mixer is used again
+        this.combinedAudioStream = null;
+        this.rtcAudioSource = null;
     }
 }
 
@@ -590,6 +605,7 @@ class VideoSink extends RTCVideoSink {
 class Assistant extends EventEmitter$1 {
     constructor({ assistantKey }) {
         super();
+        this.audioMixer = null;
         this.combinedAudioSink = null;
         this.remoteMediaTracks = {};
         this.roomUrl = null;
@@ -600,6 +616,8 @@ class Assistant extends EventEmitter$1 {
             }
             if (["left", "kicked"].includes(status)) {
                 this.stateSubscriptions.forEach((unsubscribe) => unsubscribe());
+                this.stateSubscriptions = [];
+                this.stopCombinedAudio();
                 this.emit(ASSISTANT_LEFT_ROOM, { roomUrl: this.roomUrl || "" });
             }
         };
@@ -711,12 +729,21 @@ class Assistant extends EventEmitter$1 {
         const stream = audioMixer.getCombinedAudioStream();
         const audioTracks = stream === null || stream === void 0 ? void 0 : stream.getAudioTracks();
         if (audioTracks === null || audioTracks === void 0 ? void 0 : audioTracks.length) {
+            this.audioMixer = audioMixer;
             this.combinedAudioSink = new AudioSink(audioTracks[0]);
             this.stateSubscriptions.push(this.roomConnection.subscribeToRemoteParticipants(audioMixer.handleRemoteParticipants.bind(audioMixer)));
             return this.combinedAudioSink;
         }
+        audioMixer.stopAudioMixer();
         return null;
     }
+    stopCombinedAudio() {
+        var _a, _b;
+        (_a = this.combinedAudioSink) === null || _a === void 0 ? void 0 : _a.stop();
+        this.combinedAudioSink = null;
+        (_b = this.audioMixer) === null || _b === void 0 ? void 0 : _b.stopAudioMixer();
+        this.audioMixer = null;
+    }
 }
 
 function buildRoomUrl(roomPath, wherebySubdomain, baseDomain = "whereby.com") {

package/dist/polyfills.cjs

@@ -120,9 +120,6 @@ global.RTCRtpSender = wrtc.RTCRtpSender;
 global.RTCRtpTransceiver = wrtc.RTCRtpTransceiver;
 global.RTCSctpTransport = wrtc.RTCSctpTransport;
 global.RTCSessionDescription = wrtc.RTCSessionDescription;
-// Node's `global` is not an EventTarget, so the spread below copies no event methods. Back them
-// with one so window listeners (e.g. "offline") attach instead of throwing; nothing fires in Node.
-const windowEventTarget = new EventTarget();
-global.window = Object.assign(Object.assign({}, global), { location: { pathname: "" }, screen: { width: 0 }, setInterval: global.setInterval, addEventListener: windowEventTarget.addEventListener.bind(windowEventTarget), removeEventListener: windowEventTarget.removeEventListener.bind(windowEventTarget), dispatchEvent: windowEventTarget.dispatchEvent.bind(windowEventTarget) }); // make sure all the classes / setInterval are available on window for rtcstats
+global.window = Object.assign(Object.assign({}, global), { location: { pathname: "" }, screen: { width: 0 }, setInterval: global.setInterval }); // make sure all the classes / setInterval are available on window for rtcstats
 
 exports.setWebsocketOrigin = setWebsocketOrigin;

package/dist/tools.cjs

@@ -6,14 +6,10 @@ var wrtc = require('@roamhq/wrtc');
 
 const { nonstandard: { RTCAudioSink, RTCAudioSource }, } = wrtc;
 class AudioSink extends RTCAudioSink {
-    constructor(track) {
-        super(track);
-        this._sink = new RTCAudioSink(track);
-    }
     subscribe(cb) {
-        this._sink.ondata = cb;
+        this.ondata = cb;
         return () => {
-            this._sink.ondata = undefined;
+            this.ondata = undefined;
         };
     }
 }
@@ -470,6 +466,8 @@ class AudioMixer extends events.EventEmitter {
         this.mixableSlots.set(slot, "");
     }
     getCombinedAudioStream() {
+        if (!this.combinedAudioStream)
+            this.setupMediaStream();
         return this.combinedAudioStream;
     }
     handleRemoteParticipants(participants) {
@@ -480,6 +478,8 @@ class AudioMixer extends events.EventEmitter {
             if (pid && !liveIds.has(pid))
                 this.detachMixable(pid);
         }
+        if (!this.rtcAudioSource)
+            this.setupMediaStream();
         if (!this.ffmpegProcess && this.rtcAudioSource) {
             this.ffmpegProcess = DEBUG_MIXER_OUTPUT
                 ? this.mixer.spawnFFmpegProcessDebug(this.rtcAudioSource)
@@ -501,6 +501,8 @@ class AudioMixer extends events.EventEmitter {
         if (screensharesWithAudio.length === 0) {
             return;
         }
+        if (!this.rtcAudioSource)
+            this.setupMediaStream();
         if (!this.ffmpegProcess && this.rtcAudioSource) {
             this.ffmpegProcess = DEBUG_MIXER_OUTPUT
                 ? this.mixer.spawnFFmpegProcessDebug(this.rtcAudioSource)
@@ -515,14 +517,27 @@ class AudioMixer extends events.EventEmitter {
             this.attachMixableIfNeeded(Object.assign(Object.assign({}, s), { type: "screenshare" }));
     }
     stopAudioMixer() {
+        var _a;
+        for (const binding of Object.values(this.activeSlots)) {
+            if (!binding)
+                continue;
+            try {
+                binding.stop();
+            }
+            catch (e) {
+                console.error("Failed to stop existing audio track", { error: e });
+            }
+        }
+        (_a = this.combinedAudioStream) === null || _a === void 0 ? void 0 : _a.getTracks().forEach((track) => track.stop());
         if (this.ffmpegProcess) {
             this.mixer.stopFFmpegProcess(this.ffmpegProcess);
             this.ffmpegProcess = null;
         }
         this.mixableSlots = new Map(Array.from({ length: MIXER_SLOTS }, (_, i) => [i, ""]));
         this.activeSlots = {};
-        // Recreate the media stream to avoid stale references
-        this.setupMediaStream();
+        // The media stream is recreated lazily if the mixer is used again
+        this.combinedAudioStream = null;
+        this.rtcAudioSource = null;
     }
 }
 

package/package.json

@@ -2,7 +2,7 @@
   "name": "@whereby.com/assistant-sdk",
   "description": "Assistant SDK for whereby.com",
   "author": "Whereby AS",
-  "version": "1.2.112",
+  "version": "1.2.114",
   "license": "MIT",
   "files": [
     "dist",
@@ -50,9 +50,9 @@
     "eslint": "^9.29.0",
     "prettier": "^3.5.3",
     "typescript": "^5.8.3",
+    "@whereby.com/eslint-config": "0.1.0",
     "@whereby.com/jest-config": "0.1.0",
     "@whereby.com/prettier-config": "0.1.0",
-    "@whereby.com/eslint-config": "0.1.0",
     "@whereby.com/rollup-config": "0.1.1",
     "@whereby.com/tsconfig": "0.1.0"
   },
@@ -64,7 +64,7 @@
     "express": "5.1.0",
     "uuid": "^11.0.3",
     "ws": "^8.18.0",
-    "@whereby.com/core": "1.21.0"
+    "@whereby.com/core": "1.21.2"
   },
   "prettier": "@whereby.com/prettier-config",
   "scripts": {