@hivegpt/hiveai-angular 0.0.460 → 0.0.461
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 +14 -10
- 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/voice-agent.service.js +15 -11
- package/fesm2015/hivegpt-hiveai-angular.js +14 -10
- package/fesm2015/hivegpt-hiveai-angular.js.map +1 -1
- package/lib/components/voice-agent/services/voice-agent.service.d.ts.map +1 -1
- package/package.json +1 -1
|
@@ -150,31 +150,35 @@ export class VoiceAgentService {
|
|
|
150
150
|
.subscribe((stream) => {
|
|
151
151
|
this.audioAnalyzer.start(stream);
|
|
152
152
|
});
|
|
153
|
-
// Speaking state from Daily only (NOT from AudioAnalyzer).
|
|
154
|
-
// User speaking overrides bot talking: if user speaks while bot talks, state = listening.
|
|
155
153
|
this.subscriptions.add(this.dailyClient.userSpeaking$.subscribe((s) => this.isUserSpeakingSubject.next(s)));
|
|
156
154
|
this.subscriptions.add(combineLatest([
|
|
157
155
|
this.dailyClient.speaking$,
|
|
158
156
|
this.dailyClient.userSpeaking$,
|
|
159
157
|
]).subscribe(([bot, user]) => {
|
|
158
|
+
const current = this.callStateSubject.value;
|
|
159
|
+
if (current === 'connecting' && !bot) {
|
|
160
|
+
return;
|
|
161
|
+
}
|
|
162
|
+
if (current === 'connecting' && bot) {
|
|
163
|
+
console.log(`[VoiceDebug] First bot audio arrived — transitioning to talking — ${new Date().toISOString()}`);
|
|
164
|
+
this.callStartTime = Date.now();
|
|
165
|
+
this.startDurationTimer();
|
|
166
|
+
this.callStateSubject.next('talking');
|
|
167
|
+
return;
|
|
168
|
+
}
|
|
160
169
|
if (user) {
|
|
161
170
|
this.callStateSubject.next('listening');
|
|
162
171
|
}
|
|
163
172
|
else if (bot) {
|
|
164
|
-
console.log(`[VoiceDebug] Agent starts speaking (callState → talking) — ${new Date().toISOString()}`);
|
|
165
173
|
this.callStateSubject.next('talking');
|
|
166
174
|
}
|
|
167
|
-
else if (
|
|
168
|
-
this.callStateSubject.value === 'listening') {
|
|
175
|
+
else if (current === 'talking' || current === 'listening') {
|
|
169
176
|
this.callStateSubject.next('connected');
|
|
170
177
|
}
|
|
171
178
|
}));
|
|
172
179
|
this.subscriptions.add(this.dailyClient.micMuted$.subscribe((muted) => this.isMicMutedSubject.next(muted)));
|
|
173
|
-
console.log(`[VoiceDebug] Room
|
|
174
|
-
this.
|
|
175
|
-
this.statusTextSubject.next('Connected');
|
|
176
|
-
this.callStartTime = Date.now();
|
|
177
|
-
this.startDurationTimer();
|
|
180
|
+
console.log(`[VoiceDebug] Room joined, staying in connecting until bot speaks — ${new Date().toISOString()}`);
|
|
181
|
+
this.statusTextSubject.next('Connecting...');
|
|
178
182
|
});
|
|
179
183
|
}
|
|
180
184
|
disconnect() {
|
|
@@ -222,4 +226,4 @@ VoiceAgentService.ctorParameters = () => [
|
|
|
222
226
|
{ type: WebSocketVoiceClientService },
|
|
223
227
|
{ type: DailyVoiceClientService }
|
|
224
228
|
];
|
|
225
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"voice-agent.service.js","sourceRoot":"/Users/rohitthakur/hive-gpt/HiveAI-Packages/Angular/projects/hivegpt/eventsgpt-angular/src/","sources":["lib/components/voice-agent/services/voice-agent.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { Injectable, OnDestroy } from '@angular/core';\nimport { BehaviorSubject, combineLatest, Observable, Subject, Subscription } from 'rxjs';\nimport { filter, take, takeUntil } from 'rxjs/operators';\nimport { AudioAnalyzerService } from './audio-analyzer.service';\nimport { WebSocketVoiceClientService } from './websocket-voice-client.service';\nimport { DailyVoiceClientService } from './daily-voice-client.service';\n\nexport type CallState =\n  | 'idle'\n  | 'connecting'\n  | 'connected'\n  | 'listening'\n  | 'talking'\n  | 'ended';\n\nexport interface TranscriptData {\n  text: string;\n  final: boolean;\n}\n\n/**\n * Voice agent orchestrator. Coordinates WebSocket (signaling) and Daily.js (WebRTC audio).\n *\n * CRITICAL: This service must NEVER use Socket.IO or ngx-socket-io. Voice flow uses only:\n * - Native WebSocket (WebSocketVoiceClientService) for signaling (room_created, transcripts)\n * - Daily.js (DailyVoiceClientService) for WebRTC audio. Audio does NOT flow over WebSocket.\n *\n * - Maintains callState, statusText, duration, isMicMuted, isUserSpeaking, audioLevels\n * - Uses WebSocket for room_created and transcripts only (no audio)\n * - Uses Daily.js for all audio, mic, and real-time speaking detection\n */\n@Injectable({\n  providedIn: 'root',\n})\nexport class VoiceAgentService implements OnDestroy {\n  private callStateSubject = new BehaviorSubject<CallState>('idle');\n  private statusTextSubject = new BehaviorSubject<string>('');\n  private durationSubject = new BehaviorSubject<string>('00:00');\n  private isMicMutedSubject = new BehaviorSubject<boolean>(false);\n  private isUserSpeakingSubject = new BehaviorSubject<boolean>(false);\n  private audioLevelsSubject = new BehaviorSubject<number[]>([]);\n  private userTranscriptSubject = new Subject<TranscriptData>();\n  private botTranscriptSubject = new Subject<string>();\n\n  private callStartTime = 0;\n  private durationInterval: ReturnType<typeof setInterval> | null = null;\n\n  private subscriptions = new Subscription();\n  private destroy$ = new Subject<void>();\n\n  callState$: Observable<CallState> = this.callStateSubject.asObservable();\n  statusText$: Observable<string> = this.statusTextSubject.asObservable();\n  duration$: Observable<string> = this.durationSubject.asObservable();\n  isMicMuted$: Observable<boolean> = this.isMicMutedSubject.asObservable();\n  isUserSpeaking$: Observable<boolean> = this.isUserSpeakingSubject.asObservable();\n  audioLevels$: Observable<number[]> = this.audioLevelsSubject.asObservable();\n  userTranscript$: Observable<TranscriptData> =\n    this.userTranscriptSubject.asObservable();\n  botTranscript$: Observable<string> = this.botTranscriptSubject.asObservable();\n\n  constructor(\n    private audioAnalyzer: AudioAnalyzerService,\n    private wsClient: WebSocketVoiceClientService,\n    private dailyClient: DailyVoiceClientService\n  ) {\n    // Waveform visualization only - do NOT use for speaking state\n    this.subscriptions.add(\n      this.audioAnalyzer.audioLevels$.subscribe((levels) =>\n        this.audioLevelsSubject.next(levels)\n      )\n    );\n  }\n\n  ngOnDestroy(): void {\n    this.destroy$.next();\n    this.subscriptions.unsubscribe();\n    this.disconnect();\n  }\n\n  /** Reset to idle state (e.g. when modal opens so user can click Start Call). */\n  resetToIdle(): void {\n    if (this.callStateSubject.value === 'idle') return;\n    this.stopDurationTimer();\n    this.audioAnalyzer.stop();\n    this.wsClient.disconnect();\n    // Fire-and-forget: Daily disconnect is async; connect() will await if needed\n    void this.dailyClient.disconnect();\n    this.callStateSubject.next('idle');\n    this.statusTextSubject.next('');\n    this.durationSubject.next('0:00');\n  }\n\n  async connect(\n    apiUrl: string,\n    token: string,\n    botId: string,\n    conversationId: string,\n    apiKey: string,\n    eventToken: string,\n    eventUrl: string,\n    domainAuthority: string\n  ): Promise<void> {\n    if (this.callStateSubject.value !== 'idle') {\n      console.warn('Call already in progress');\n      return;\n    }\n\n    try {\n      this.callStateSubject.next('connecting');\n      this.statusTextSubject.next('Connecting...');\n\n      const baseUrl = apiUrl.replace(/\\/$/, '');\n      const postUrl = `${baseUrl}/ai/ask-voice`;\n\n      const headers: Record<string, string> = {\n        'Content-Type': 'application/json',\n        Authorization: `Bearer ${token}`,\n        'domain-authority': domainAuthority,\n        'eventtoken': eventToken,\n        'eventurl': eventUrl,\n        'hive-bot-id': botId,\n        'x-api-key': apiKey,\n        \"ngrok-skip-browser-warning\":\"true\"\n      };\n\n      // POST to get ws_url for signaling\n      const res = await fetch(postUrl, {\n        method: 'POST',\n        headers,\n        body: JSON.stringify({\n          bot_id: botId,\n          conversation_id: conversationId,\n          voice: 'alloy',\n        }),\n      });\n\n      if (!res.ok) {\n        throw new Error(`HTTP ${res.status}`);\n      }\n\n      const json = await res.json();\n      // Use only WebSocket URL. Do NOT use any Socket.IO URL (e.g. socket_io_url).\n      const wsUrl = json?.rn_ws_url;\n      if (!wsUrl || typeof wsUrl !== 'string') {\n        throw new Error('No ws_url in response');\n      }\n\n      // Subscribe to room_created BEFORE connecting to avoid race\n      this.wsClient.roomCreated$\n        .pipe(take(1), takeUntil(this.destroy$))\n        .subscribe(async (roomUrl) => {\n          try {\n            await this.onRoomCreated(roomUrl);\n          } catch (err) {\n            console.error('Daily join failed:', err);\n            this.callStateSubject.next('ended');\n            this.statusTextSubject.next('Connection failed');\n            await this.disconnect();\n            throw err;\n          }\n        });\n\n      // Forward transcripts from WebSocket\n      this.subscriptions.add(\n        this.wsClient.userTranscript$\n          .pipe(takeUntil(this.destroy$))\n          .subscribe((t) => this.userTranscriptSubject.next(t))\n      );\n      this.subscriptions.add(\n        this.wsClient.botTranscript$\n          .pipe(takeUntil(this.destroy$))\n          .subscribe((t) => this.botTranscriptSubject.next(t))\n      );\n\n      // Connect signaling WebSocket (no audio over WS)\n      this.wsClient.connect(wsUrl);\n    } catch (error) {\n      console.error('Error connecting voice agent:', error);\n      this.callStateSubject.next('ended');\n      await this.disconnect();\n      this.statusTextSubject.next('Connection failed');\n      throw error;\n    }\n  }\n\n  private async onRoomCreated(roomUrl: string): Promise<void> {\n    // Connect Daily.js for WebRTC audio\n    await this.dailyClient.connect(roomUrl);\n\n    // Waveform: use local mic stream from Daily client\n    this.dailyClient.localStream$\n      .pipe(filter((s): s is MediaStream => s != null), take(1))\n      .subscribe((stream) => {\n        this.audioAnalyzer.start(stream);\n      });\n\n    // Speaking state from Daily only (NOT from AudioAnalyzer).\n    // User speaking overrides bot talking: if user speaks while bot talks, state = listening.\n    this.subscriptions.add(\n      this.dailyClient.userSpeaking$.subscribe((s) =>\n        this.isUserSpeakingSubject.next(s)\n      )\n    );\n    this.subscriptions.add(\n      combineLatest([\n        this.dailyClient.speaking$,\n        this.dailyClient.userSpeaking$,\n      ]).subscribe(([bot, user]) => {\n        if (user) {\n          this.callStateSubject.next('listening');\n        } else if (bot) {\n          console.log(`[VoiceDebug] Agent starts speaking (callState → talking) — ${new Date().toISOString()}`);\n          this.callStateSubject.next('talking');\n        } else if (\n          this.callStateSubject.value === 'talking' ||\n          this.callStateSubject.value === 'listening'\n        ) {\n          this.callStateSubject.next('connected');\n        }\n      })\n    );\n\n    this.subscriptions.add(\n      this.dailyClient.micMuted$.subscribe((muted) =>\n        this.isMicMutedSubject.next(muted)\n      )\n    );\n\n    console.log(`[VoiceDebug] Room fully connected (callState → connected) — ${new Date().toISOString()}`);\n    this.callStateSubject.next('connected');\n    this.statusTextSubject.next('Connected');\n    this.callStartTime = Date.now();\n    this.startDurationTimer();\n  }\n\n  async disconnect(): Promise<void> {\n    this.stopDurationTimer();\n    this.audioAnalyzer.stop();\n\n    // Daily first, then WebSocket\n    await this.dailyClient.disconnect();\n    this.wsClient.disconnect();\n\n    this.callStateSubject.next('ended');\n    this.statusTextSubject.next('Call Ended');\n  }\n\n  toggleMic(): void {\n    const current = this.isMicMutedSubject.value;\n    this.dailyClient.setMuted(!current);\n  }\n\n  private startDurationTimer(): void {\n    const updateDuration = () => {\n      if (this.callStartTime > 0) {\n        const elapsed = Math.floor((Date.now() - this.callStartTime) / 1000);\n        const minutes = Math.floor(elapsed / 60);\n        const seconds = elapsed % 60;\n        this.durationSubject.next(\n          `${minutes}:${String(seconds).padStart(2, '0')}`\n        );\n      }\n    };\n    updateDuration();\n    this.durationInterval = setInterval(updateDuration, 1000);\n  }\n\n  private stopDurationTimer(): void {\n    if (this.durationInterval) {\n      clearInterval(this.durationInterval);\n      this.durationInterval = null;\n    }\n  }\n}\n"]}
|
|
229
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"voice-agent.service.js","sourceRoot":"/Users/rohitthakur/hive-gpt/HiveAI-Packages/Angular/projects/hivegpt/eventsgpt-angular/src/","sources":["lib/components/voice-agent/services/voice-agent.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { Injectable, OnDestroy } from '@angular/core';\nimport { BehaviorSubject, combineLatest, Observable, Subject, Subscription } from 'rxjs';\nimport { filter, take, takeUntil } from 'rxjs/operators';\nimport { AudioAnalyzerService } from './audio-analyzer.service';\nimport { WebSocketVoiceClientService } from './websocket-voice-client.service';\nimport { DailyVoiceClientService } from './daily-voice-client.service';\n\nexport type CallState =\n  | 'idle'\n  | 'connecting'\n  | 'connected'\n  | 'listening'\n  | 'talking'\n  | 'ended';\n\nexport interface TranscriptData {\n  text: string;\n  final: boolean;\n}\n\n/**\n * Voice agent orchestrator. Coordinates WebSocket (signaling) and Daily.js (WebRTC audio).\n *\n * CRITICAL: This service must NEVER use Socket.IO or ngx-socket-io. Voice flow uses only:\n * - Native WebSocket (WebSocketVoiceClientService) for signaling (room_created, transcripts)\n * - Daily.js (DailyVoiceClientService) for WebRTC audio. Audio does NOT flow over WebSocket.\n *\n * - Maintains callState, statusText, duration, isMicMuted, isUserSpeaking, audioLevels\n * - Uses WebSocket for room_created and transcripts only (no audio)\n * - Uses Daily.js for all audio, mic, and real-time speaking detection\n */\n@Injectable({\n  providedIn: 'root',\n})\nexport class VoiceAgentService implements OnDestroy {\n  private callStateSubject = new BehaviorSubject<CallState>('idle');\n  private statusTextSubject = new BehaviorSubject<string>('');\n  private durationSubject = new BehaviorSubject<string>('00:00');\n  private isMicMutedSubject = new BehaviorSubject<boolean>(false);\n  private isUserSpeakingSubject = new BehaviorSubject<boolean>(false);\n  private audioLevelsSubject = new BehaviorSubject<number[]>([]);\n  private userTranscriptSubject = new Subject<TranscriptData>();\n  private botTranscriptSubject = new Subject<string>();\n\n  private callStartTime = 0;\n  private durationInterval: ReturnType<typeof setInterval> | null = null;\n\n  private subscriptions = new Subscription();\n  private destroy$ = new Subject<void>();\n\n  callState$: Observable<CallState> = this.callStateSubject.asObservable();\n  statusText$: Observable<string> = this.statusTextSubject.asObservable();\n  duration$: Observable<string> = this.durationSubject.asObservable();\n  isMicMuted$: Observable<boolean> = this.isMicMutedSubject.asObservable();\n  isUserSpeaking$: Observable<boolean> = this.isUserSpeakingSubject.asObservable();\n  audioLevels$: Observable<number[]> = this.audioLevelsSubject.asObservable();\n  userTranscript$: Observable<TranscriptData> =\n    this.userTranscriptSubject.asObservable();\n  botTranscript$: Observable<string> = this.botTranscriptSubject.asObservable();\n\n  constructor(\n    private audioAnalyzer: AudioAnalyzerService,\n    private wsClient: WebSocketVoiceClientService,\n    private dailyClient: DailyVoiceClientService\n  ) {\n    // Waveform visualization only - do NOT use for speaking state\n    this.subscriptions.add(\n      this.audioAnalyzer.audioLevels$.subscribe((levels) =>\n        this.audioLevelsSubject.next(levels)\n      )\n    );\n  }\n\n  ngOnDestroy(): void {\n    this.destroy$.next();\n    this.subscriptions.unsubscribe();\n    this.disconnect();\n  }\n\n  /** Reset to idle state (e.g. when modal opens so user can click Start Call). */\n  resetToIdle(): void {\n    if (this.callStateSubject.value === 'idle') return;\n    this.stopDurationTimer();\n    this.audioAnalyzer.stop();\n    this.wsClient.disconnect();\n    // Fire-and-forget: Daily disconnect is async; connect() will await if needed\n    void this.dailyClient.disconnect();\n    this.callStateSubject.next('idle');\n    this.statusTextSubject.next('');\n    this.durationSubject.next('0:00');\n  }\n\n  async connect(\n    apiUrl: string,\n    token: string,\n    botId: string,\n    conversationId: string,\n    apiKey: string,\n    eventToken: string,\n    eventUrl: string,\n    domainAuthority: string\n  ): Promise<void> {\n    if (this.callStateSubject.value !== 'idle') {\n      console.warn('Call already in progress');\n      return;\n    }\n\n    try {\n      this.callStateSubject.next('connecting');\n      this.statusTextSubject.next('Connecting...');\n\n      const baseUrl = apiUrl.replace(/\\/$/, '');\n      const postUrl = `${baseUrl}/ai/ask-voice`;\n\n      const headers: Record<string, string> = {\n        'Content-Type': 'application/json',\n        Authorization: `Bearer ${token}`,\n        'domain-authority': domainAuthority,\n        'eventtoken': eventToken,\n        'eventurl': eventUrl,\n        'hive-bot-id': botId,\n        'x-api-key': apiKey,\n        \"ngrok-skip-browser-warning\":\"true\"\n      };\n\n      // POST to get ws_url for signaling\n      const res = await fetch(postUrl, {\n        method: 'POST',\n        headers,\n        body: JSON.stringify({\n          bot_id: botId,\n          conversation_id: conversationId,\n          voice: 'alloy',\n        }),\n      });\n\n      if (!res.ok) {\n        throw new Error(`HTTP ${res.status}`);\n      }\n\n      const json = await res.json();\n      // Use only WebSocket URL. Do NOT use any Socket.IO URL (e.g. socket_io_url).\n      const wsUrl = json?.rn_ws_url;\n      if (!wsUrl || typeof wsUrl !== 'string') {\n        throw new Error('No ws_url in response');\n      }\n\n      // Subscribe to room_created BEFORE connecting to avoid race\n      this.wsClient.roomCreated$\n        .pipe(take(1), takeUntil(this.destroy$))\n        .subscribe(async (roomUrl) => {\n          try {\n            await this.onRoomCreated(roomUrl);\n          } catch (err) {\n            console.error('Daily join failed:', err);\n            this.callStateSubject.next('ended');\n            this.statusTextSubject.next('Connection failed');\n            await this.disconnect();\n            throw err;\n          }\n        });\n\n      // Forward transcripts from WebSocket\n      this.subscriptions.add(\n        this.wsClient.userTranscript$\n          .pipe(takeUntil(this.destroy$))\n          .subscribe((t) => this.userTranscriptSubject.next(t))\n      );\n      this.subscriptions.add(\n        this.wsClient.botTranscript$\n          .pipe(takeUntil(this.destroy$))\n          .subscribe((t) => this.botTranscriptSubject.next(t))\n      );\n\n      // Connect signaling WebSocket (no audio over WS)\n      this.wsClient.connect(wsUrl);\n    } catch (error) {\n      console.error('Error connecting voice agent:', error);\n      this.callStateSubject.next('ended');\n      await this.disconnect();\n      this.statusTextSubject.next('Connection failed');\n      throw error;\n    }\n  }\n\n  private async onRoomCreated(roomUrl: string): Promise<void> {\n    // Connect Daily.js for WebRTC audio\n    await this.dailyClient.connect(roomUrl);\n\n    // Waveform: use local mic stream from Daily client\n    this.dailyClient.localStream$\n      .pipe(filter((s): s is MediaStream => s != null), take(1))\n      .subscribe((stream) => {\n        this.audioAnalyzer.start(stream);\n      });\n\n    this.subscriptions.add(\n      this.dailyClient.userSpeaking$.subscribe((s) =>\n        this.isUserSpeakingSubject.next(s)\n      )\n    );\n    this.subscriptions.add(\n      combineLatest([\n        this.dailyClient.speaking$,\n        this.dailyClient.userSpeaking$,\n      ]).subscribe(([bot, user]) => {\n        const current = this.callStateSubject.value;\n        if (current === 'connecting' && !bot) {\n          return;\n        }\n        if (current === 'connecting' && bot) {\n          console.log(`[VoiceDebug] First bot audio arrived — transitioning to talking — ${new Date().toISOString()}`);\n          this.callStartTime = Date.now();\n          this.startDurationTimer();\n          this.callStateSubject.next('talking');\n          return;\n        }\n        if (user) {\n          this.callStateSubject.next('listening');\n        } else if (bot) {\n          this.callStateSubject.next('talking');\n        } else if (current === 'talking' || current === 'listening') {\n          this.callStateSubject.next('connected');\n        }\n      })\n    );\n\n    this.subscriptions.add(\n      this.dailyClient.micMuted$.subscribe((muted) =>\n        this.isMicMutedSubject.next(muted)\n      )\n    );\n\n    console.log(`[VoiceDebug] Room joined, staying in connecting until bot speaks — ${new Date().toISOString()}`);\n    this.statusTextSubject.next('Connecting...');\n  }\n\n  async disconnect(): Promise<void> {\n    this.stopDurationTimer();\n    this.audioAnalyzer.stop();\n\n    // Daily first, then WebSocket\n    await this.dailyClient.disconnect();\n    this.wsClient.disconnect();\n\n    this.callStateSubject.next('ended');\n    this.statusTextSubject.next('Call Ended');\n  }\n\n  toggleMic(): void {\n    const current = this.isMicMutedSubject.value;\n    this.dailyClient.setMuted(!current);\n  }\n\n  private startDurationTimer(): void {\n    const updateDuration = () => {\n      if (this.callStartTime > 0) {\n        const elapsed = Math.floor((Date.now() - this.callStartTime) / 1000);\n        const minutes = Math.floor(elapsed / 60);\n        const seconds = elapsed % 60;\n        this.durationSubject.next(\n          `${minutes}:${String(seconds).padStart(2, '0')}`\n        );\n      }\n    };\n    updateDuration();\n    this.durationInterval = setInterval(updateDuration, 1000);\n  }\n\n  private stopDurationTimer(): void {\n    if (this.durationInterval) {\n      clearInterval(this.durationInterval);\n      this.durationInterval = null;\n    }\n  }\n}\n"]}
|
|
@@ -1160,31 +1160,35 @@ class VoiceAgentService {
|
|
|
1160
1160
|
.subscribe((stream) => {
|
|
1161
1161
|
this.audioAnalyzer.start(stream);
|
|
1162
1162
|
});
|
|
1163
|
-
// Speaking state from Daily only (NOT from AudioAnalyzer).
|
|
1164
|
-
// User speaking overrides bot talking: if user speaks while bot talks, state = listening.
|
|
1165
1163
|
this.subscriptions.add(this.dailyClient.userSpeaking$.subscribe((s) => this.isUserSpeakingSubject.next(s)));
|
|
1166
1164
|
this.subscriptions.add(combineLatest([
|
|
1167
1165
|
this.dailyClient.speaking$,
|
|
1168
1166
|
this.dailyClient.userSpeaking$,
|
|
1169
1167
|
]).subscribe(([bot, user]) => {
|
|
1168
|
+
const current = this.callStateSubject.value;
|
|
1169
|
+
if (current === 'connecting' && !bot) {
|
|
1170
|
+
return;
|
|
1171
|
+
}
|
|
1172
|
+
if (current === 'connecting' && bot) {
|
|
1173
|
+
console.log(`[VoiceDebug] First bot audio arrived — transitioning to talking — ${new Date().toISOString()}`);
|
|
1174
|
+
this.callStartTime = Date.now();
|
|
1175
|
+
this.startDurationTimer();
|
|
1176
|
+
this.callStateSubject.next('talking');
|
|
1177
|
+
return;
|
|
1178
|
+
}
|
|
1170
1179
|
if (user) {
|
|
1171
1180
|
this.callStateSubject.next('listening');
|
|
1172
1181
|
}
|
|
1173
1182
|
else if (bot) {
|
|
1174
|
-
console.log(`[VoiceDebug] Agent starts speaking (callState → talking) — ${new Date().toISOString()}`);
|
|
1175
1183
|
this.callStateSubject.next('talking');
|
|
1176
1184
|
}
|
|
1177
|
-
else if (
|
|
1178
|
-
this.callStateSubject.value === 'listening') {
|
|
1185
|
+
else if (current === 'talking' || current === 'listening') {
|
|
1179
1186
|
this.callStateSubject.next('connected');
|
|
1180
1187
|
}
|
|
1181
1188
|
}));
|
|
1182
1189
|
this.subscriptions.add(this.dailyClient.micMuted$.subscribe((muted) => this.isMicMutedSubject.next(muted)));
|
|
1183
|
-
console.log(`[VoiceDebug] Room
|
|
1184
|
-
this.
|
|
1185
|
-
this.statusTextSubject.next('Connected');
|
|
1186
|
-
this.callStartTime = Date.now();
|
|
1187
|
-
this.startDurationTimer();
|
|
1190
|
+
console.log(`[VoiceDebug] Room joined, staying in connecting until bot speaks — ${new Date().toISOString()}`);
|
|
1191
|
+
this.statusTextSubject.next('Connecting...');
|
|
1188
1192
|
});
|
|
1189
1193
|
}
|
|
1190
1194
|
disconnect() {
|