@hivegpt/hiveai-angular 0.0.479 → 0.0.481

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

@@ -1646,31 +1646,62 @@
         };
         VoiceAgentService.prototype.connect = function (apiUrl, token, botId, conversationId, apiKey, eventToken, eventUrl, domainAuthority) {
             return __awaiter(this, void 0, void 0, function () {
-                var baseUrl, postUrl, headers, res, json, wsUrl, err_1, error_1;
-                var _this = this;
-                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*/];
                             }
-                            _a.label = 1;
+                            _b.label = 1;
                         case 1:
-                            _a.trys.push([1, 9, , 11]);
+                            _b.trys.push([1, 3, , 5]);
                             this.callStateSubject.next('connecting');
                             this.statusTextSubject.next('Connecting...');
-                            baseUrl = apiUrl.replace(/\/$/, '');
+                            return [4 /*yield*/, Promise.all([
+                                    this.connectWebSocketSignaling(token, botId, conversationId, apiKey, eventToken, eventUrl, domainAuthority),
+                                    this.dailyClient.connect(STATIC_DAILY_ROOM_URL),
+                                ])];
+                        case 2:
+                            _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:
+                            error_1 = _b.sent();
+                            console.error('Error connecting voice agent:', error_1);
+                            this.callStateSubject.next('ended');
+                            return [4 /*yield*/, this.disconnect()];
+                        case 4:
+                            _b.sent();
+                            this.statusTextSubject.next('Connection failed');
+                            throw error_1;
+                        case 5: return [2 /*return*/];
+                    }
+                });
+            });
+        };
+        /** 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:
                             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,
+                                eventtoken: eventToken,
+                                eventurl: eventUrl,
                                 'hive-bot-id': botId,
                                 'x-api-key': apiKey,
-                                "ngrok-skip-browser-warning": "true"
+                                'ngrok-skip-browser-warning': 'true',
                             };
                             return [4 /*yield*/, fetch(postUrl, {
                                     method: 'POST',
@@ -1681,109 +1712,66 @@
                                         voice: 'alloy',
                                     }),
                                 })];
-                        case 2:
+                        case 1:
                             res = _a.sent();
                             if (!res.ok) {
                                 throw new Error("HTTP " + res.status);
                             }
                             return [4 /*yield*/, res.json()];
-                        case 3:
+                        case 2:
                             json = _a.sent();
                             wsUrl = json === null || json === void 0 ? void 0 : json.rn_ws_url;
                             if (!wsUrl || typeof wsUrl !== 'string') {
-                                throw new Error('No ws_url in response');
+                                return [2 /*return*/, false];
                             }
-                            // Forward transcripts from WebSocket
                             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); }));
-                            // Connect signaling WebSocket (no audio over WS)
                             this.wsClient.connect(wsUrl);
-                            _a.label = 4;
-                        case 4:
-                            _a.trys.push([4, 6, , 8]);
-                            return [4 /*yield*/, this.onRoomCreated(STATIC_DAILY_ROOM_URL)];
-                        case 5:
-                            _a.sent();
-                            return [3 /*break*/, 8];
-                        case 6:
-                            err_1 = _a.sent();
-                            console.error('Daily join failed:', err_1);
-                            this.callStateSubject.next('ended');
-                            this.statusTextSubject.next('Connection failed');
-                            return [4 /*yield*/, this.disconnect()];
-                        case 7:
-                            _a.sent();
-                            throw err_1;
-                        case 8: return [3 /*break*/, 11];
-                        case 9:
-                            error_1 = _a.sent();
-                            console.error('Error connecting voice agent:', error_1);
-                            this.callStateSubject.next('ended');
-                            return [4 /*yield*/, this.disconnect()];
-                        case 10:
-                            _a.sent();
-                            this.statusTextSubject.next('Connection failed');
-                            throw error_1;
-                        case 11: return [2 /*return*/];
+                            return [2 /*return*/, true];
                     }
                 });
             });
         };
-        VoiceAgentService.prototype.onRoomCreated = function (roomUrl) {
-            return __awaiter(this, void 0, void 0, function () {
-                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 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*/];
-                    }
-                });
+        /** 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 () {