@hivegpt/hiveai-angular 0.0.480 → 0.0.481

package/bundles/hivegpt-hiveai-angular.umd.js

@@ -1587,11 +1587,15 @@
     /** Static Daily.co room URL (used instead of dynamic room_created from backend). */
     var STATIC_DAILY_ROOM_URL = 'https://cloud-4a46e9dfbc8c499daddd480d9c294b88.daily.co/voice-None-1772776583';
     /**
-     * Voice agent orchestrator. Connects directly to a hardcoded Daily.co room — no API or WebSocket.
+     * Voice agent orchestrator. Coordinates WebSocket (signaling) and Daily.js (WebRTC audio).
      *
-     * - When the modal opens, connect() is called and joins STATIC_DAILY_ROOM_URL immediately.
-     * - Daily.js (DailyVoiceClientService) handles all WebRTC audio, mic, and speaking detection.
-     * - Maintains callState, statusText, duration, isMicMuted, isUserSpeaking, audioLevels.
+     * CRITICAL: This service must NEVER use Socket.IO or ngx-socket-io. Voice flow uses only:
+     * - Native WebSocket (WebSocketVoiceClientService) for signaling (transcripts)
+     * - Daily.js (DailyVoiceClientService) for WebRTC audio via STATIC_DAILY_ROOM_URL.
+     *
+     * - Maintains callState, statusText, duration, isMicMuted, isUserSpeaking, audioLevels
+     * - Uses WebSocket for transcripts only (no audio)
+     * - Uses Daily.js for all audio, mic, and real-time speaking detection
      */
     var VoiceAgentService = /** @class */ (function () {
         function VoiceAgentService(audioAnalyzer, wsClient, dailyClient) {
@@ -1622,10 +1626,6 @@
             // Waveform visualization only - do NOT use for speaking state
             this.subscriptions.add(this.audioAnalyzer.audioLevels$.subscribe(function (levels) { return _this.audioLevelsSubject.next(levels); }));
         }
-        /** Current call state (for checking if connection was already started). */
-        VoiceAgentService.prototype.getCallState = function () {
-            return this.callStateSubject.value;
-        };
         VoiceAgentService.prototype.ngOnDestroy = function () {
             this.destroy$.next();
             this.subscriptions.unsubscribe();
@@ -1644,92 +1644,135 @@
             this.statusTextSubject.next('');
             this.durationSubject.next('0:00');
         };
-        /** Connect directly to the hardcoded Daily room. No API or WebSocket — as soon as modal opens. */
-        VoiceAgentService.prototype.connect = function () {
+        VoiceAgentService.prototype.connect = function (apiUrl, token, botId, conversationId, apiKey, eventToken, eventUrl, domainAuthority) {
             return __awaiter(this, void 0, void 0, function () {
-                var err_1;
-                return __generator(this, function (_a) {
-                    switch (_a.label) {
+                var _a, wsOk, error_1;
+                return __generator(this, function (_b) {
+                    switch (_b.label) {
                         case 0:
                             if (this.callStateSubject.value !== 'idle') {
                                 console.warn('Call already in progress');
                                 return [2 /*return*/];
                             }
+                            _b.label = 1;
+                        case 1:
+                            _b.trys.push([1, 3, , 5]);
                             this.callStateSubject.next('connecting');
                             this.statusTextSubject.next('Connecting...');
-                            _a.label = 1;
-                        case 1:
-                            _a.trys.push([1, 3, , 5]);
-                            return [4 /*yield*/, this.onRoomCreated(STATIC_DAILY_ROOM_URL)];
+                            return [4 /*yield*/, Promise.all([
+                                    this.connectWebSocketSignaling(token, botId, conversationId, apiKey, eventToken, eventUrl, domainAuthority),
+                                    this.dailyClient.connect(STATIC_DAILY_ROOM_URL),
+                                ])];
                         case 2:
-                            _a.sent();
+                            _a = __read.apply(void 0, [_b.sent(), 1]), wsOk = _a[0];
+                            if (!wsOk) {
+                                throw new Error('No ws_url in response');
+                            }
+                            this.setupDailySubscriptions();
                             return [3 /*break*/, 5];
                         case 3:
-                            err_1 = _a.sent();
-                            console.error('Daily join failed:', err_1);
+                            error_1 = _b.sent();
+                            console.error('Error connecting voice agent:', error_1);
                             this.callStateSubject.next('ended');
-                            this.statusTextSubject.next('Connection failed');
                             return [4 /*yield*/, this.disconnect()];
                         case 4:
-                            _a.sent();
-                            throw err_1;
+                            _b.sent();
+                            this.statusTextSubject.next('Connection failed');
+                            throw error_1;
                         case 5: return [2 /*return*/];
                     }
                 });
             });
         };
-        VoiceAgentService.prototype.onRoomCreated = function (roomUrl) {
+        /** POST for ws_url, wire transcript streams, connect WebSocket. Returns true if ws_url was found. */
+        VoiceAgentService.prototype.connectWebSocketSignaling = function (token, botId, conversationId, apiKey, eventToken, eventUrl, domainAuthority) {
             return __awaiter(this, void 0, void 0, function () {
+                var postUrl, headers, res, json, wsUrl;
                 var _this = this;
                 return __generator(this, function (_a) {
                     switch (_a.label) {
-                        case 0: 
-                        // Connect Daily.js for WebRTC audio
-                        return [4 /*yield*/, this.dailyClient.connect(roomUrl)];
+                        case 0:
+                            postUrl = "https://0a19-2405-201-5c02-991e-2487-d56-2543-bda8.ngrok-free.app/ai/ask-voice";
+                            headers = {
+                                'Content-Type': 'application/json',
+                                Authorization: "Bearer " + token,
+                                'domain-authority': domainAuthority,
+                                eventtoken: eventToken,
+                                eventurl: eventUrl,
+                                'hive-bot-id': botId,
+                                'x-api-key': apiKey,
+                                'ngrok-skip-browser-warning': 'true',
+                            };
+                            return [4 /*yield*/, fetch(postUrl, {
+                                    method: 'POST',
+                                    headers: headers,
+                                    body: JSON.stringify({
+                                        bot_id: botId,
+                                        conversation_id: conversationId,
+                                        voice: 'alloy',
+                                    }),
+                                })];
                         case 1:
-                            // Connect Daily.js for WebRTC audio
-                            _a.sent();
-                            // Waveform: use local mic stream from Daily client
-                            this.dailyClient.localStream$
-                                .pipe(operators.filter(function (s) { return s != null; }), operators.take(1))
-                                .subscribe(function (stream) {
-                                _this.audioAnalyzer.start(stream);
-                            });
-                            this.subscriptions.add(this.dailyClient.userSpeaking$.subscribe(function (s) { return _this.isUserSpeakingSubject.next(s); }));
-                            this.subscriptions.add(rxjs.combineLatest([
-                                this.dailyClient.speaking$,
-                                this.dailyClient.userSpeaking$,
-                            ]).subscribe(function (_a) {
-                                var _b = __read(_a, 2), bot = _b[0], user = _b[1];
-                                var current = _this.callStateSubject.value;
-                                if (current === 'connecting' && !bot) {
-                                    return;
-                                }
-                                if (current === 'connecting' && bot) {
-                                    console.log("[VoiceDebug] First bot audio arrived \u2014 transitioning to talking \u2014 " + new Date().toISOString());
-                                    _this.callStartTime = Date.now();
-                                    _this.startDurationTimer();
-                                    _this.callStateSubject.next('talking');
-                                    return;
-                                }
-                                if (user) {
-                                    _this.callStateSubject.next('listening');
-                                }
-                                else if (bot) {
-                                    _this.callStateSubject.next('talking');
-                                }
-                                else if (current === 'talking' || current === 'listening') {
-                                    _this.callStateSubject.next('connected');
-                                }
-                            }));
-                            this.subscriptions.add(this.dailyClient.micMuted$.subscribe(function (muted) { return _this.isMicMutedSubject.next(muted); }));
-                            console.log("[VoiceDebug] Room joined, staying in connecting until bot speaks \u2014 " + new Date().toISOString());
-                            this.statusTextSubject.next('Connecting...');
-                            return [2 /*return*/];
+                            res = _a.sent();
+                            if (!res.ok) {
+                                throw new Error("HTTP " + res.status);
+                            }
+                            return [4 /*yield*/, res.json()];
+                        case 2:
+                            json = _a.sent();
+                            wsUrl = json === null || json === void 0 ? void 0 : json.rn_ws_url;
+                            if (!wsUrl || typeof wsUrl !== 'string') {
+                                return [2 /*return*/, false];
+                            }
+                            this.subscriptions.add(this.wsClient.userTranscript$
+                                .pipe(operators.takeUntil(this.destroy$))
+                                .subscribe(function (t) { return _this.userTranscriptSubject.next(t); }));
+                            this.subscriptions.add(this.wsClient.botTranscript$
+                                .pipe(operators.takeUntil(this.destroy$))
+                                .subscribe(function (t) { return _this.botTranscriptSubject.next(t); }));
+                            this.wsClient.connect(wsUrl);
+                            return [2 /*return*/, true];
                     }
                 });
             });
         };
+        /** Wire Daily client to UI state (waveform, speaking, mic muted). Call after Daily is connected. */
+        VoiceAgentService.prototype.setupDailySubscriptions = function () {
+            var _this = this;
+            this.dailyClient.localStream$
+                .pipe(operators.filter(function (s) { return s != null; }), operators.take(1))
+                .subscribe(function (stream) {
+                _this.audioAnalyzer.start(stream);
+            });
+            this.subscriptions.add(this.dailyClient.userSpeaking$.subscribe(function (s) { return _this.isUserSpeakingSubject.next(s); }));
+            this.subscriptions.add(rxjs.combineLatest([
+                this.dailyClient.speaking$,
+                this.dailyClient.userSpeaking$,
+            ]).subscribe(function (_a) {
+                var _b = __read(_a, 2), bot = _b[0], user = _b[1];
+                var current = _this.callStateSubject.value;
+                if (current === 'connecting' && !bot) {
+                    return;
+                }
+                if (current === 'connecting' && bot) {
+                    _this.callStartTime = Date.now();
+                    _this.startDurationTimer();
+                    _this.callStateSubject.next('talking');
+                    return;
+                }
+                if (user) {
+                    _this.callStateSubject.next('listening');
+                }
+                else if (bot) {
+                    _this.callStateSubject.next('talking');
+                }
+                else if (current === 'talking' || current === 'listening') {
+                    _this.callStateSubject.next('connected');
+                }
+            }));
+            this.subscriptions.add(this.dailyClient.micMuted$.subscribe(function (muted) { return _this.isMicMutedSubject.next(muted); }));
+            this.statusTextSubject.next('Connecting...');
+        };
         VoiceAgentService.prototype.disconnect = function () {
             return __awaiter(this, void 0, void 0, function () {
                 return __generator(this, function (_a) {
@@ -1863,13 +1906,9 @@
             this.subscriptions.push(this.voiceAgentService.audioLevels$.subscribe(function (levels) {
                 _this.audioLevels = levels;
             }));
-            // If connection was already started from the drawer (openVoiceModal), don't reset or start again.
-            var state = this.voiceAgentService.getCallState();
-            var alreadyStarted = state !== 'idle' && state !== 'ended';
-            if (!alreadyStarted) {
-                this.voiceAgentService.resetToIdle();
-                void this.startCall();
-            }
+            // Modal opens in idle state, then immediately starts connecting.
+            this.voiceAgentService.resetToIdle();
+            void this.startCall();
         };
         VoiceAgentModalComponent.prototype.ngOnDestroy = function () {
             this.subscriptions.forEach(function (sub) { return sub.unsubscribe(); });
@@ -1887,7 +1926,7 @@
                             _g.label = 1;
                         case 1:
                             _g.trys.push([1, 3, 4, 5]);
-                            return [4 /*yield*/, this.voiceAgentService.connect()];
+                            return [4 /*yield*/, this.voiceAgentService.connect(this.apiUrl, this.token, this.botId, this.conversationId, this.apiKey, this.eventToken, this.eventUrl, this.domainAuthority)];
                         case 2:
                             _g.sent();
                             return [3 /*break*/, 5];
@@ -4244,8 +4283,6 @@
             var conversationId = (_b = (_a = this.conversationKey) !== null && _a !== void 0 ? _a : this.conversationService.getKey(this.botId, false)) !== null && _b !== void 0 ? _b : '';
             this.voiceModalConversationId = conversationId;
             this.setupVoiceTranscripts();
-            // Start connecting to the voice room immediately (no wait for modal to open)
-            void this.voiceAgentService.connect();
             // Close existing overlay if any
             if (this.voiceModalOverlayRef) {
                 this.voiceModalOverlayRef.detach();