@hivegpt/hiveai-angular 0.0.430 → 0.0.431
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/bundles/hivegpt-hiveai-angular.umd.js +60 -18
- package/bundles/hivegpt-hiveai-angular.umd.js.map +1 -1
- package/bundles/hivegpt-hiveai-angular.umd.min.js +1 -1
- package/bundles/hivegpt-hiveai-angular.umd.min.js.map +1 -1
- package/esm2015/lib/components/voice-agent/services/daily-voice-client.service.js +47 -5
- package/fesm2015/hivegpt-hiveai-angular.js +46 -4
- package/fesm2015/hivegpt-hiveai-angular.js.map +1 -1
- package/hivegpt-hiveai-angular.metadata.json +1 -1
- package/lib/components/voice-agent/services/daily-voice-client.service.d.ts +8 -0
- package/lib/components/voice-agent/services/daily-voice-client.service.d.ts.map +1 -1
- package/package.json +1 -1
|
@@ -23,6 +23,8 @@ export class DailyVoiceClientService {
|
|
|
23
23
|
this.callObject = null;
|
|
24
24
|
this.localStream = null;
|
|
25
25
|
this.localSessionId = null;
|
|
26
|
+
/** Explicit playback of remote (bot) audio; required in some browsers. */
|
|
27
|
+
this.remoteAudioElement = null;
|
|
26
28
|
this.speakingSubject = new BehaviorSubject(false);
|
|
27
29
|
this.userSpeakingSubject = new BehaviorSubject(false);
|
|
28
30
|
this.micMutedSubject = new BehaviorSubject(false);
|
|
@@ -101,16 +103,21 @@ export class DailyVoiceClientService {
|
|
|
101
103
|
this.speakingSubject.next(!isLocal);
|
|
102
104
|
});
|
|
103
105
|
});
|
|
104
|
-
// track-started / track-stopped:
|
|
105
|
-
// remote
|
|
106
|
-
//
|
|
106
|
+
// track-started / track-stopped: play remote (bot) audio explicitly and update speaking state.
|
|
107
|
+
// Browsers often do not auto-play remote WebRTC audio; attaching to an HTMLAudioElement and
|
|
108
|
+
// calling play() ensures the user hears the agent.
|
|
107
109
|
call.on('track-started', (event) => {
|
|
108
110
|
this.ngZone.run(() => {
|
|
109
|
-
var _a, _b;
|
|
111
|
+
var _a, _b, _c, _d;
|
|
110
112
|
const p = event === null || event === void 0 ? void 0 : event.participant;
|
|
111
113
|
const type = (_a = event === null || event === void 0 ? void 0 : event.type) !== null && _a !== void 0 ? _a : (_b = event === null || event === void 0 ? void 0 : event.track) === null || _b === void 0 ? void 0 : _b.kind;
|
|
114
|
+
const track = event === null || event === void 0 ? void 0 : event.track;
|
|
112
115
|
if (p && !p.local && type === 'audio') {
|
|
113
116
|
this.speakingSubject.next(true);
|
|
117
|
+
const audioTrack = track !== null && track !== void 0 ? track : (_d = (_c = p.tracks) === null || _c === void 0 ? void 0 : _c.audio) === null || _d === void 0 ? void 0 : _d.track;
|
|
118
|
+
if (audioTrack && typeof audioTrack === 'object') {
|
|
119
|
+
this.playRemoteTrack(audioTrack);
|
|
120
|
+
}
|
|
114
121
|
}
|
|
115
122
|
});
|
|
116
123
|
});
|
|
@@ -121,6 +128,7 @@ export class DailyVoiceClientService {
|
|
|
121
128
|
const type = (_a = event === null || event === void 0 ? void 0 : event.type) !== null && _a !== void 0 ? _a : (_b = event === null || event === void 0 ? void 0 : event.track) === null || _b === void 0 ? void 0 : _b.kind;
|
|
122
129
|
if (p && !p.local && type === 'audio') {
|
|
123
130
|
this.speakingSubject.next(false);
|
|
131
|
+
this.stopRemoteAudio();
|
|
124
132
|
}
|
|
125
133
|
});
|
|
126
134
|
});
|
|
@@ -135,6 +143,39 @@ export class DailyVoiceClientService {
|
|
|
135
143
|
});
|
|
136
144
|
});
|
|
137
145
|
}
|
|
146
|
+
/**
|
|
147
|
+
* Play remote (bot) audio track via a dedicated audio element.
|
|
148
|
+
* Required in many browsers where Daily's internal playback does not output to speakers.
|
|
149
|
+
*/
|
|
150
|
+
playRemoteTrack(track) {
|
|
151
|
+
this.stopRemoteAudio();
|
|
152
|
+
try {
|
|
153
|
+
const stream = new MediaStream([track]);
|
|
154
|
+
const audio = new Audio();
|
|
155
|
+
audio.autoplay = true;
|
|
156
|
+
audio.srcObject = stream;
|
|
157
|
+
this.remoteAudioElement = audio;
|
|
158
|
+
const p = audio.play();
|
|
159
|
+
if (p && typeof p.catch === 'function') {
|
|
160
|
+
p.catch((err) => {
|
|
161
|
+
console.warn('DailyVoiceClient: remote audio play failed (may need user gesture)', err);
|
|
162
|
+
});
|
|
163
|
+
}
|
|
164
|
+
}
|
|
165
|
+
catch (err) {
|
|
166
|
+
console.warn('DailyVoiceClient: failed to create remote audio element', err);
|
|
167
|
+
}
|
|
168
|
+
}
|
|
169
|
+
stopRemoteAudio() {
|
|
170
|
+
if (this.remoteAudioElement) {
|
|
171
|
+
try {
|
|
172
|
+
this.remoteAudioElement.pause();
|
|
173
|
+
this.remoteAudioElement.srcObject = null;
|
|
174
|
+
}
|
|
175
|
+
catch (_) { }
|
|
176
|
+
this.remoteAudioElement = null;
|
|
177
|
+
}
|
|
178
|
+
}
|
|
138
179
|
/** Set mic muted state. */
|
|
139
180
|
setMuted(muted) {
|
|
140
181
|
if (!this.callObject)
|
|
@@ -159,6 +200,7 @@ export class DailyVoiceClientService {
|
|
|
159
200
|
});
|
|
160
201
|
}
|
|
161
202
|
cleanup() {
|
|
203
|
+
this.stopRemoteAudio();
|
|
162
204
|
if (this.callObject) {
|
|
163
205
|
this.callObject.destroy().catch(() => { });
|
|
164
206
|
this.callObject = null;
|
|
@@ -183,4 +225,4 @@ DailyVoiceClientService.decorators = [
|
|
|
183
225
|
DailyVoiceClientService.ctorParameters = () => [
|
|
184
226
|
{ type: NgZone }
|
|
185
227
|
];
|
|
186
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"daily-voice-client.service.js","sourceRoot":"/Users/rohitthakur/hive-gpt/HiveAI-Packages/Angular/projects/hivegpt/eventsgpt-angular/src/","sources":["lib/components/voice-agent/services/daily-voice-client.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { Injectable, NgZone } from '@angular/core';\nimport { BehaviorSubject, Observable } from 'rxjs';\nimport Daily from '@daily-co/daily-js';\nimport type { DailyCall, DailyParticipant } from '@daily-co/daily-js';\n\n/**\n * Daily.js WebRTC client for voice agent audio.\n * Responsibilities:\n * - Create and manage Daily CallObject\n * - Join Daily room using room_url\n * - Handle mic capture + speaker playback\n * - Provide real-time speaking detection via active-speaker-change (primary)\n *   and track-started/track-stopped (fallback for immediate feedback)\n * - Expose speaking$ (bot speaking), userSpeaking$ (user speaking), micMuted$\n * - Expose localStream$ for waveform visualization (AudioAnalyzerService)\n *\n * Speaking state flips immediately when agent audio starts playing.\n * If user speaks while bot is talking, state switches to listening.\n */\n@Injectable({\n  providedIn: 'root',\n})\nexport class DailyVoiceClientService {\n  private callObject: DailyCall | null = null;\n  private localStream: MediaStream | null = null;\n  private localSessionId: string | null = null;\n\n  private speakingSubject = new BehaviorSubject<boolean>(false);\n  private userSpeakingSubject = new BehaviorSubject<boolean>(false);\n  private micMutedSubject = new BehaviorSubject<boolean>(false);\n  private localStreamSubject = new BehaviorSubject<MediaStream | null>(null);\n\n  /** True when bot (remote participant) is the active speaker. */\n  speaking$: Observable<boolean> = this.speakingSubject.asObservable();\n\n  /** True when user (local participant) is the active speaker. */\n  userSpeaking$: Observable<boolean> = this.userSpeakingSubject.asObservable();\n\n  /** True when mic is muted. */\n  micMuted$: Observable<boolean> = this.micMutedSubject.asObservable();\n\n  /** Emits local mic stream for waveform visualization. */\n  localStream$: Observable<MediaStream | null> =\n    this.localStreamSubject.asObservable();\n\n  constructor(private ngZone: NgZone) {}\n\n  /**\n   * Connect to Daily room. Acquires mic first for waveform, then joins with audio.\n   * @param roomUrl Daily room URL (from room_created)\n   * @param token Optional meeting token\n   */\n  async connect(roomUrl: string, token?: string): Promise<void> {\n    if (this.callObject) {\n      await this.disconnect();\n    }\n\n    try {\n      // Get mic stream for both Daily and waveform (single capture)\n      const stream = await navigator.mediaDevices.getUserMedia({ audio: true });\n      const audioTrack = stream.getAudioTracks()[0];\n      if (!audioTrack) {\n        stream.getTracks().forEach((t) => t.stop());\n        throw new Error('No audio track');\n      }\n\n      this.localStream = stream;\n      this.localStreamSubject.next(stream);\n\n      // Create audio-only call object\n      // videoSource: false = no camera, audioSource = our mic track\n      const callObject = Daily.createCallObject({\n        videoSource: false,\n        audioSource: audioTrack,\n      });\n\n      this.callObject = callObject;\n\n      this.setupEventHandlers(callObject);\n\n      // Join room; Daily handles playback of remote (bot) audio automatically.\n      // Only pass token when it's a non-empty string (Daily rejects undefined/non-string).\n      const joinOptions: { url: string; token?: string } = { url: roomUrl };\n      if (typeof token === 'string' && token.trim() !== '') {\n        joinOptions.token = token;\n      }\n      await callObject.join(joinOptions);\n\n      const participants = callObject.participants();\n      if (participants?.local) {\n        this.localSessionId = participants.local.session_id;\n      }\n\n      // Initial mute state: Daily starts with audio on\n      this.micMutedSubject.next(!callObject.localAudio());\n    } catch (err) {\n      this.cleanup();\n      throw err;\n    }\n  }\n\n  private setupEventHandlers(call: DailyCall): void {\n    // active-speaker-change: primary source for real-time speaking detection.\n    // Emits when the loudest participant changes; bot speaking = remote is active.\n    call.on('active-speaker-change', (event: { activeSpeaker?: { peerId?: string } }) => {\n      this.ngZone.run(() => {\n        const peerId = event?.activeSpeaker?.peerId;\n        if (!peerId || !this.localSessionId) {\n          this.speakingSubject.next(false);\n          this.userSpeakingSubject.next(false);\n          return;\n        }\n        const isLocal = peerId === this.localSessionId;\n        this.userSpeakingSubject.next(isLocal);\n        this.speakingSubject.next(!isLocal);\n      });\n    });\n\n    // track-started / track-stopped: fallback for immediate feedback when\n    // remote (bot) audio track starts or stops. Ensures talking indicator\n    // flips as soon as agent audio begins, without waiting for active-speaker-change.\n    call.on('track-started', (event: { participant?: DailyParticipant | null; type?: string; track?: MediaStreamTrack }) => {\n      this.ngZone.run(() => {\n        const p = event?.participant;\n        const type = event?.type ?? event?.track?.kind;\n        if (p && !p.local && type === 'audio') {\n          this.speakingSubject.next(true);\n        }\n      });\n    });\n\n    call.on('track-stopped', (event: { participant?: DailyParticipant | null; type?: string; track?: MediaStreamTrack }) => {\n      this.ngZone.run(() => {\n        const p = event?.participant;\n        const type = event?.type ?? event?.track?.kind;\n        if (p && !p.local && type === 'audio') {\n          this.speakingSubject.next(false);\n        }\n      });\n    });\n\n    call.on('left-meeting', () => {\n      this.ngZone.run(() => this.cleanup());\n    });\n\n    call.on('error', (event?: { errorMsg?: string }) => {\n      this.ngZone.run(() => {\n        console.error('DailyVoiceClient: Daily error', event?.errorMsg ?? event);\n        this.cleanup();\n      });\n    });\n  }\n\n  /** Set mic muted state. */\n  setMuted(muted: boolean): void {\n    if (!this.callObject) return;\n    this.callObject.setLocalAudio(!muted);\n    this.micMutedSubject.next(muted);\n  }\n\n  /** Disconnect and cleanup. */\n  async disconnect(): Promise<void> {\n    if (!this.callObject) {\n      this.cleanup();\n      return;\n    }\n    try {\n      await this.callObject.leave();\n    } catch (e) {\n      // ignore\n    }\n    this.cleanup();\n  }\n\n  private cleanup(): void {\n    if (this.callObject) {\n      this.callObject.destroy().catch(() => {});\n      this.callObject = null;\n    }\n    if (this.localStream) {\n      this.localStream.getTracks().forEach((t) => t.stop());\n      this.localStream = null;\n    }\n    this.localSessionId = null;\n    this.speakingSubject.next(false);\n    this.userSpeakingSubject.next(false);\n    this.localStreamSubject.next(null);\n    // Keep last micMuted state; will reset on next connect\n  }\n}\n"]}
|
|
228
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"daily-voice-client.service.js","sourceRoot":"/Users/rohitthakur/hive-gpt/HiveAI-Packages/Angular/projects/hivegpt/eventsgpt-angular/src/","sources":["lib/components/voice-agent/services/daily-voice-client.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { Injectable, NgZone } from '@angular/core';\nimport { BehaviorSubject, Observable } from 'rxjs';\nimport Daily from '@daily-co/daily-js';\nimport type { DailyCall, DailyParticipant } from '@daily-co/daily-js';\n\n/**\n * Daily.js WebRTC client for voice agent audio.\n * Responsibilities:\n * - Create and manage Daily CallObject\n * - Join Daily room using room_url\n * - Handle mic capture + speaker playback\n * - Provide real-time speaking detection via active-speaker-change (primary)\n *   and track-started/track-stopped (fallback for immediate feedback)\n * - Expose speaking$ (bot speaking), userSpeaking$ (user speaking), micMuted$\n * - Expose localStream$ for waveform visualization (AudioAnalyzerService)\n *\n * Speaking state flips immediately when agent audio starts playing.\n * If user speaks while bot is talking, state switches to listening.\n */\n@Injectable({\n  providedIn: 'root',\n})\nexport class DailyVoiceClientService {\n  private callObject: DailyCall | null = null;\n  private localStream: MediaStream | null = null;\n  private localSessionId: string | null = null;\n  /** Explicit playback of remote (bot) audio; required in some browsers. */\n  private remoteAudioElement: HTMLAudioElement | null = null;\n\n  private speakingSubject = new BehaviorSubject<boolean>(false);\n  private userSpeakingSubject = new BehaviorSubject<boolean>(false);\n  private micMutedSubject = new BehaviorSubject<boolean>(false);\n  private localStreamSubject = new BehaviorSubject<MediaStream | null>(null);\n\n  /** True when bot (remote participant) is the active speaker. */\n  speaking$: Observable<boolean> = this.speakingSubject.asObservable();\n\n  /** True when user (local participant) is the active speaker. */\n  userSpeaking$: Observable<boolean> = this.userSpeakingSubject.asObservable();\n\n  /** True when mic is muted. */\n  micMuted$: Observable<boolean> = this.micMutedSubject.asObservable();\n\n  /** Emits local mic stream for waveform visualization. */\n  localStream$: Observable<MediaStream | null> =\n    this.localStreamSubject.asObservable();\n\n  constructor(private ngZone: NgZone) {}\n\n  /**\n   * Connect to Daily room. Acquires mic first for waveform, then joins with audio.\n   * @param roomUrl Daily room URL (from room_created)\n   * @param token Optional meeting token\n   */\n  async connect(roomUrl: string, token?: string): Promise<void> {\n    if (this.callObject) {\n      await this.disconnect();\n    }\n\n    try {\n      // Get mic stream for both Daily and waveform (single capture)\n      const stream = await navigator.mediaDevices.getUserMedia({ audio: true });\n      const audioTrack = stream.getAudioTracks()[0];\n      if (!audioTrack) {\n        stream.getTracks().forEach((t) => t.stop());\n        throw new Error('No audio track');\n      }\n\n      this.localStream = stream;\n      this.localStreamSubject.next(stream);\n\n      // Create audio-only call object\n      // videoSource: false = no camera, audioSource = our mic track\n      const callObject = Daily.createCallObject({\n        videoSource: false,\n        audioSource: audioTrack,\n      });\n\n      this.callObject = callObject;\n\n      this.setupEventHandlers(callObject);\n\n      // Join room; Daily handles playback of remote (bot) audio automatically.\n      // Only pass token when it's a non-empty string (Daily rejects undefined/non-string).\n      const joinOptions: { url: string; token?: string } = { url: roomUrl };\n      if (typeof token === 'string' && token.trim() !== '') {\n        joinOptions.token = token;\n      }\n      await callObject.join(joinOptions);\n\n      const participants = callObject.participants();\n      if (participants?.local) {\n        this.localSessionId = participants.local.session_id;\n      }\n\n      // Initial mute state: Daily starts with audio on\n      this.micMutedSubject.next(!callObject.localAudio());\n    } catch (err) {\n      this.cleanup();\n      throw err;\n    }\n  }\n\n  private setupEventHandlers(call: DailyCall): void {\n    // active-speaker-change: primary source for real-time speaking detection.\n    // Emits when the loudest participant changes; bot speaking = remote is active.\n    call.on('active-speaker-change', (event: { activeSpeaker?: { peerId?: string } }) => {\n      this.ngZone.run(() => {\n        const peerId = event?.activeSpeaker?.peerId;\n        if (!peerId || !this.localSessionId) {\n          this.speakingSubject.next(false);\n          this.userSpeakingSubject.next(false);\n          return;\n        }\n        const isLocal = peerId === this.localSessionId;\n        this.userSpeakingSubject.next(isLocal);\n        this.speakingSubject.next(!isLocal);\n      });\n    });\n\n    // track-started / track-stopped: play remote (bot) audio explicitly and update speaking state.\n    // Browsers often do not auto-play remote WebRTC audio; attaching to an HTMLAudioElement and\n    // calling play() ensures the user hears the agent.\n    call.on('track-started', (event: { participant?: DailyParticipant | null; type?: string; track?: MediaStreamTrack }) => {\n      this.ngZone.run(() => {\n        const p = event?.participant;\n        const type = event?.type ?? event?.track?.kind;\n        const track = event?.track;\n        if (p && !p.local && type === 'audio') {\n          this.speakingSubject.next(true);\n          const audioTrack = track ?? (p as { tracks?: { audio?: { track?: MediaStreamTrack } } }).tracks?.audio?.track;\n          if (audioTrack && typeof audioTrack === 'object') {\n            this.playRemoteTrack(audioTrack);\n          }\n        }\n      });\n    });\n\n    call.on('track-stopped', (event: { participant?: DailyParticipant | null; type?: string; track?: MediaStreamTrack }) => {\n      this.ngZone.run(() => {\n        const p = event?.participant;\n        const type = event?.type ?? event?.track?.kind;\n        if (p && !p.local && type === 'audio') {\n          this.speakingSubject.next(false);\n          this.stopRemoteAudio();\n        }\n      });\n    });\n\n    call.on('left-meeting', () => {\n      this.ngZone.run(() => this.cleanup());\n    });\n\n    call.on('error', (event?: { errorMsg?: string }) => {\n      this.ngZone.run(() => {\n        console.error('DailyVoiceClient: Daily error', event?.errorMsg ?? event);\n        this.cleanup();\n      });\n    });\n  }\n\n  /**\n   * Play remote (bot) audio track via a dedicated audio element.\n   * Required in many browsers where Daily's internal playback does not output to speakers.\n   */\n  private playRemoteTrack(track: MediaStreamTrack): void {\n    this.stopRemoteAudio();\n    try {\n      const stream = new MediaStream([track]);\n      const audio = new Audio();\n      audio.autoplay = true;\n      audio.srcObject = stream;\n      this.remoteAudioElement = audio;\n      const p = audio.play();\n      if (p && typeof p.catch === 'function') {\n        p.catch((err) => {\n          console.warn('DailyVoiceClient: remote audio play failed (may need user gesture)', err);\n        });\n      }\n    } catch (err) {\n      console.warn('DailyVoiceClient: failed to create remote audio element', err);\n    }\n  }\n\n  private stopRemoteAudio(): void {\n    if (this.remoteAudioElement) {\n      try {\n        this.remoteAudioElement.pause();\n        this.remoteAudioElement.srcObject = null;\n      } catch (_) {}\n      this.remoteAudioElement = null;\n    }\n  }\n\n  /** Set mic muted state. */\n  setMuted(muted: boolean): void {\n    if (!this.callObject) return;\n    this.callObject.setLocalAudio(!muted);\n    this.micMutedSubject.next(muted);\n  }\n\n  /** Disconnect and cleanup. */\n  async disconnect(): Promise<void> {\n    if (!this.callObject) {\n      this.cleanup();\n      return;\n    }\n    try {\n      await this.callObject.leave();\n    } catch (e) {\n      // ignore\n    }\n    this.cleanup();\n  }\n\n  private cleanup(): void {\n    this.stopRemoteAudio();\n    if (this.callObject) {\n      this.callObject.destroy().catch(() => {});\n      this.callObject = null;\n    }\n    if (this.localStream) {\n      this.localStream.getTracks().forEach((t) => t.stop());\n      this.localStream = null;\n    }\n    this.localSessionId = null;\n    this.speakingSubject.next(false);\n    this.userSpeakingSubject.next(false);\n    this.localStreamSubject.next(null);\n    // Keep last micMuted state; will reset on next connect\n  }\n}\n"]}
|
|
@@ -732,6 +732,8 @@ class DailyVoiceClientService {
|
|
|
732
732
|
this.callObject = null;
|
|
733
733
|
this.localStream = null;
|
|
734
734
|
this.localSessionId = null;
|
|
735
|
+
/** Explicit playback of remote (bot) audio; required in some browsers. */
|
|
736
|
+
this.remoteAudioElement = null;
|
|
735
737
|
this.speakingSubject = new BehaviorSubject(false);
|
|
736
738
|
this.userSpeakingSubject = new BehaviorSubject(false);
|
|
737
739
|
this.micMutedSubject = new BehaviorSubject(false);
|
|
@@ -810,16 +812,21 @@ class DailyVoiceClientService {
|
|
|
810
812
|
this.speakingSubject.next(!isLocal);
|
|
811
813
|
});
|
|
812
814
|
});
|
|
813
|
-
// track-started / track-stopped:
|
|
814
|
-
// remote
|
|
815
|
-
//
|
|
815
|
+
// track-started / track-stopped: play remote (bot) audio explicitly and update speaking state.
|
|
816
|
+
// Browsers often do not auto-play remote WebRTC audio; attaching to an HTMLAudioElement and
|
|
817
|
+
// calling play() ensures the user hears the agent.
|
|
816
818
|
call.on('track-started', (event) => {
|
|
817
819
|
this.ngZone.run(() => {
|
|
818
|
-
var _a, _b;
|
|
820
|
+
var _a, _b, _c, _d;
|
|
819
821
|
const p = event === null || event === void 0 ? void 0 : event.participant;
|
|
820
822
|
const type = (_a = event === null || event === void 0 ? void 0 : event.type) !== null && _a !== void 0 ? _a : (_b = event === null || event === void 0 ? void 0 : event.track) === null || _b === void 0 ? void 0 : _b.kind;
|
|
823
|
+
const track = event === null || event === void 0 ? void 0 : event.track;
|
|
821
824
|
if (p && !p.local && type === 'audio') {
|
|
822
825
|
this.speakingSubject.next(true);
|
|
826
|
+
const audioTrack = track !== null && track !== void 0 ? track : (_d = (_c = p.tracks) === null || _c === void 0 ? void 0 : _c.audio) === null || _d === void 0 ? void 0 : _d.track;
|
|
827
|
+
if (audioTrack && typeof audioTrack === 'object') {
|
|
828
|
+
this.playRemoteTrack(audioTrack);
|
|
829
|
+
}
|
|
823
830
|
}
|
|
824
831
|
});
|
|
825
832
|
});
|
|
@@ -830,6 +837,7 @@ class DailyVoiceClientService {
|
|
|
830
837
|
const type = (_a = event === null || event === void 0 ? void 0 : event.type) !== null && _a !== void 0 ? _a : (_b = event === null || event === void 0 ? void 0 : event.track) === null || _b === void 0 ? void 0 : _b.kind;
|
|
831
838
|
if (p && !p.local && type === 'audio') {
|
|
832
839
|
this.speakingSubject.next(false);
|
|
840
|
+
this.stopRemoteAudio();
|
|
833
841
|
}
|
|
834
842
|
});
|
|
835
843
|
});
|
|
@@ -844,6 +852,39 @@ class DailyVoiceClientService {
|
|
|
844
852
|
});
|
|
845
853
|
});
|
|
846
854
|
}
|
|
855
|
+
/**
|
|
856
|
+
* Play remote (bot) audio track via a dedicated audio element.
|
|
857
|
+
* Required in many browsers where Daily's internal playback does not output to speakers.
|
|
858
|
+
*/
|
|
859
|
+
playRemoteTrack(track) {
|
|
860
|
+
this.stopRemoteAudio();
|
|
861
|
+
try {
|
|
862
|
+
const stream = new MediaStream([track]);
|
|
863
|
+
const audio = new Audio();
|
|
864
|
+
audio.autoplay = true;
|
|
865
|
+
audio.srcObject = stream;
|
|
866
|
+
this.remoteAudioElement = audio;
|
|
867
|
+
const p = audio.play();
|
|
868
|
+
if (p && typeof p.catch === 'function') {
|
|
869
|
+
p.catch((err) => {
|
|
870
|
+
console.warn('DailyVoiceClient: remote audio play failed (may need user gesture)', err);
|
|
871
|
+
});
|
|
872
|
+
}
|
|
873
|
+
}
|
|
874
|
+
catch (err) {
|
|
875
|
+
console.warn('DailyVoiceClient: failed to create remote audio element', err);
|
|
876
|
+
}
|
|
877
|
+
}
|
|
878
|
+
stopRemoteAudio() {
|
|
879
|
+
if (this.remoteAudioElement) {
|
|
880
|
+
try {
|
|
881
|
+
this.remoteAudioElement.pause();
|
|
882
|
+
this.remoteAudioElement.srcObject = null;
|
|
883
|
+
}
|
|
884
|
+
catch (_) { }
|
|
885
|
+
this.remoteAudioElement = null;
|
|
886
|
+
}
|
|
887
|
+
}
|
|
847
888
|
/** Set mic muted state. */
|
|
848
889
|
setMuted(muted) {
|
|
849
890
|
if (!this.callObject)
|
|
@@ -868,6 +909,7 @@ class DailyVoiceClientService {
|
|
|
868
909
|
});
|
|
869
910
|
}
|
|
870
911
|
cleanup() {
|
|
912
|
+
this.stopRemoteAudio();
|
|
871
913
|
if (this.callObject) {
|
|
872
914
|
this.callObject.destroy().catch(() => { });
|
|
873
915
|
this.callObject = null;
|