Refactor async GET and LLM, add connection UI

- Execute GET requests in a dedicated thread with its own Tokio runtime,
  add timeout handling and clearer error messages.
- Tighten `is_safe_path` checks and simplify HTTP/S3 logic.
- Change `llm_keyword` to accept `Arc<AppState>`, add prompt builder,
  run LLM generation in an isolated thread with timeout.
- Update keyword registration call in `basic/mod.rs`.
- Convert template script to use `let` declarations and return a
  boolean.
- Introduce connection‑status indicator in the web UI with styles,
  automatic reconnection attempts, and proper WS/WSS handling for voice.
This commit is contained in:
Rodrigo Rodriguez (Pragmatismo) 2025-10-15 21:18:01 -03:00
parent 3609bf4eaf
commit ff89298e61
6 changed files with 256 additions and 145 deletions

1
prompts/dev/keywords.md Normal file
View file

@ -0,0 +1 @@
- When generating new Rhai keyword handlers in Rust, always design them to be thread-safe and fully compatible with async execution. Use Arc for shared state, perform heavy or async operations with tokio::task::block_in_place and Handle::current().block_on, and return results as rhai::Dynamic to maintain safe cross-thread communication between Rust and the Rhai engine.

View file

@ -13,13 +13,11 @@ pub fn get_keyword(state: Arc<AppState>, _user: UserSession, engine: &mut Engine
engine engine
.register_custom_syntax(&["GET", "$expr$"], false, move |context, inputs| { .register_custom_syntax(&["GET", "$expr$"], false, move |context, inputs| {
// Evaluate the URL expression
let url = context.eval_expression_tree(&inputs[0])?; let url = context.eval_expression_tree(&inputs[0])?;
let url_str = url.to_string(); let url_str = url.to_string();
info!("GET command executed: {}", url_str); info!("GET command executed: {}", url_str);
// Enhanced security check for path traversal
if !is_safe_path(&url_str) { if !is_safe_path(&url_str) {
return Err(Box::new(rhai::EvalAltResult::ErrorRuntime( return Err(Box::new(rhai::EvalAltResult::ErrorRuntime(
"URL contains invalid or unsafe path sequences".into(), "URL contains invalid or unsafe path sequences".into(),
@ -30,37 +28,49 @@ pub fn get_keyword(state: Arc<AppState>, _user: UserSession, engine: &mut Engine
let state_for_blocking = Arc::clone(&state_clone); let state_for_blocking = Arc::clone(&state_clone);
let url_for_blocking = url_str.clone(); let url_for_blocking = url_str.clone();
// Use spawn_blocking for synchronous execution of async operations // ---- fixed section: spawn on separate thread runtime ----
let result = tokio::task::block_in_place(|| { let (tx, rx) = std::sync::mpsc::channel();
tokio::runtime::Handle::current().block_on(async { std::thread::spawn(move || {
debug!("Starting GET operation: {}", url_for_blocking); let rt = tokio::runtime::Builder::new_multi_thread()
.worker_threads(2)
.enable_all()
.build();
let result = if url_for_blocking.starts_with("https://") let send_err = if let Ok(rt) = rt {
|| url_for_blocking.starts_with("http://") let result = rt.block_on(async move {
{ if url_for_blocking.starts_with("https://")
info!("HTTP(S) GET request: {}", url_for_blocking); || url_for_blocking.starts_with("http://")
execute_get(&url_for_blocking).await {
} else { info!("HTTP(S) GET request: {}", url_for_blocking);
info!("Local file GET request from bucket: {}", url_for_blocking); execute_get(&url_for_blocking).await
get_from_bucket(&state_for_blocking, &url_for_blocking).await } else {
}; info!("Local file GET request from bucket: {}", url_for_blocking);
get_from_bucket(&state_for_blocking, &url_for_blocking).await
}
});
tx.send(result).err()
} else {
tx.send(Err("failed to build tokio runtime".into())).err()
};
debug!( if send_err.is_some() {
"GET operation completed for: {}, success: {}", error!("Failed to send result from thread");
url_for_blocking, }
result.is_ok()
);
result
})
}); });
match result { match rx.recv_timeout(std::time::Duration::from_secs(40)) {
Ok(content) => Ok(Dynamic::from(content)), Ok(Ok(content)) => Ok(Dynamic::from(content)),
Err(e) => Err(Box::new(rhai::EvalAltResult::ErrorRuntime( Ok(Err(e)) => Err(Box::new(rhai::EvalAltResult::ErrorRuntime(
e.to_string().into(), e.to_string().into(),
rhai::Position::NONE, rhai::Position::NONE,
))), ))),
Err(std::sync::mpsc::RecvTimeoutError::Timeout) => Err(Box::new(
rhai::EvalAltResult::ErrorRuntime("GET timed out".into(), rhai::Position::NONE),
)),
Err(e) => Err(Box::new(rhai::EvalAltResult::ErrorRuntime(
format!("GET failed: {e}").into(),
rhai::Position::NONE,
))),
} }
}) })
.unwrap(); .unwrap();
@ -68,32 +78,18 @@ pub fn get_keyword(state: Arc<AppState>, _user: UserSession, engine: &mut Engine
/// Enhanced security check for path traversal and unsafe paths /// Enhanced security check for path traversal and unsafe paths
fn is_safe_path(path: &str) -> bool { fn is_safe_path(path: &str) -> bool {
// Allow full URLs
if path.starts_with("https://") || path.starts_with("http://") { if path.starts_with("https://") || path.starts_with("http://") {
return true; return true;
} }
if path.contains("..") || path.starts_with('/') {
// Check for various path traversal patterns
if path.contains("..") {
return false; return false;
} }
// Reject absolute paths (starting with /)
if path.starts_with('/') {
return false;
}
// Reject Windows-style absolute paths
if path.len() >= 2 && path.chars().nth(1) == Some(':') { if path.len() >= 2 && path.chars().nth(1) == Some(':') {
return false; return false;
} }
// Additional checks for suspicious patterns
if path.contains("//") || path.contains("~") || path.contains("*") || path.contains("?") { if path.contains("//") || path.contains("~") || path.contains("*") || path.contains("?") {
return false; return false;
} }
// For local file paths, ensure they don't try to escape
if !path.starts_with("http") { if !path.starts_with("http") {
let path_obj = Path::new(path); let path_obj = Path::new(path);
if path_obj.components().count() if path_obj.components().count()
@ -105,14 +101,12 @@ fn is_safe_path(path: &str) -> bool {
return false; return false;
} }
} }
true true
} }
pub async fn execute_get(url: &str) -> Result<String, Box<dyn Error + Send + Sync>> { pub async fn execute_get(url: &str) -> Result<String, Box<dyn Error + Send + Sync>> {
debug!("Starting execute_get with URL: {}", url); debug!("Starting execute_get with URL: {}", url);
// Build secure HTTP client with reasonable timeouts
let client = Client::builder() let client = Client::builder()
.timeout(Duration::from_secs(30)) .timeout(Duration::from_secs(30))
.connect_timeout(Duration::from_secs(10)) .connect_timeout(Duration::from_secs(10))
@ -128,7 +122,6 @@ pub async fn execute_get(url: &str) -> Result<String, Box<dyn Error + Send + Syn
e e
})?; })?;
// Check response status
if !response.status().is_success() { if !response.status().is_success() {
let status = response.status(); let status = response.status();
let error_body = response.text().await.unwrap_or_default(); let error_body = response.text().await.unwrap_or_default();
@ -162,28 +155,19 @@ pub async fn get_from_bucket(
) -> Result<String, Box<dyn Error + Send + Sync>> { ) -> Result<String, Box<dyn Error + Send + Sync>> {
debug!("Getting file from bucket: {}", file_path); debug!("Getting file from bucket: {}", file_path);
// Additional validation for file path
if !is_safe_path(file_path) { if !is_safe_path(file_path) {
error!("Unsafe file path detected: {}", file_path); error!("Unsafe file path detected: {}", file_path);
return Err("Invalid file path".into()); return Err("Invalid file path".into());
} }
// Ensure the S3 client is configured
let s3_client = match &state.s3_client { let s3_client = match &state.s3_client {
Some(client) => { Some(client) => client,
debug!("S3 client is available");
client
}
None => { None => {
error!( error!("S3 client not configured");
"S3 client not configured when trying to get file: {}",
file_path
);
return Err("S3 client not configured".into()); return Err("S3 client not configured".into());
} }
}; };
// Resolve the bucket name safely, handling missing configuration values
let bucket_name = { let bucket_name = {
let cfg = state let cfg = state
.config .config
@ -195,10 +179,9 @@ pub async fn get_from_bucket(
let org_prefix = &cfg.minio.org_prefix; let org_prefix = &cfg.minio.org_prefix;
// Validate org_prefix doesn't contain suspicious characters
if org_prefix.contains("..") || org_prefix.contains('/') || org_prefix.contains('\\') { if org_prefix.contains("..") || org_prefix.contains('/') || org_prefix.contains('\\') {
error!("Invalid org_prefix in configuration: {}", org_prefix); error!("Invalid org_prefix: {}", org_prefix);
return Err("Invalid organization prefix in configuration".into()); return Err("Invalid organization prefix".into());
} }
let bucket = format!("{}default.gbai", org_prefix); let bucket = format!("{}default.gbai", org_prefix);
@ -206,21 +189,14 @@ pub async fn get_from_bucket(
bucket bucket
}; };
debug!("Using bucket: {} for file: {}", bucket_name, file_path);
// Check if bucket exists first (optional but helpful for debugging)
match s3_client.head_bucket().bucket(&bucket_name).send().await { match s3_client.head_bucket().bucket(&bucket_name).send().await {
Ok(_) => debug!("Bucket exists: {}", bucket_name), Ok(_) => debug!("Bucket exists: {}", bucket_name),
Err(e) => { Err(e) => {
error!( error!("Bucket inaccessible: {} - {}", bucket_name, e);
"Bucket does not exist or inaccessible: {} - {}",
bucket_name, e
);
return Err(format!("Bucket inaccessible: {}", e).into()); return Err(format!("Bucket inaccessible: {}", e).into());
} }
} }
// Perform the S3 GetObject request with timeout
let get_object_future = s3_client let get_object_future = s3_client
.get_object() .get_object()
.bucket(&bucket_name) .bucket(&bucket_name)
@ -228,53 +204,30 @@ pub async fn get_from_bucket(
.send(); .send();
let response = match tokio::time::timeout(Duration::from_secs(30), get_object_future).await { let response = match tokio::time::timeout(Duration::from_secs(30), get_object_future).await {
Ok(Ok(response)) => { Ok(Ok(response)) => response,
debug!("S3 GetObject successful for key: {}", file_path);
response
}
Ok(Err(e)) => { Ok(Err(e)) => {
error!( error!("S3 get_object failed: {}", e);
"S3 get_object failed for bucket {} key {}: {}",
bucket_name, file_path, e
);
return Err(format!("S3 operation failed: {}", e).into()); return Err(format!("S3 operation failed: {}", e).into());
} }
Err(_) => { Err(_) => {
error!( error!("S3 get_object timed out");
"S3 get_object timed out for bucket {} key {}",
bucket_name, file_path
);
return Err("S3 operation timed out".into()); return Err("S3 operation timed out".into());
} }
}; };
// Collect the body bytes with timeout
let body_future = response.body.collect(); let body_future = response.body.collect();
let data = match tokio::time::timeout(Duration::from_secs(30), body_future).await { let data = match tokio::time::timeout(Duration::from_secs(30), body_future).await {
Ok(Ok(data)) => { Ok(Ok(data)) => data,
debug!(
"Successfully collected S3 response body for key: {}",
file_path
);
data
}
Ok(Err(e)) => { Ok(Err(e)) => {
error!( error!("Failed to collect S3 response body: {}", e);
"Failed to collect S3 response body for bucket {} key {}: {}",
bucket_name, file_path, e
);
return Err(format!("Failed to read S3 response: {}", e).into()); return Err(format!("Failed to read S3 response: {}", e).into());
} }
Err(_) => { Err(_) => {
error!( error!("Timeout collecting S3 response body");
"Timeout collecting S3 response body for bucket {} key {}",
bucket_name, file_path
);
return Err("Timeout reading S3 response body".into()); return Err("Timeout reading S3 response body".into());
} }
}; };
// Handle PDF files specially; otherwise treat as UTF8 text
let bytes = data.into_bytes().to_vec(); let bytes = data.into_bytes().to_vec();
debug!( debug!(
"Retrieved {} bytes from S3 for key: {}", "Retrieved {} bytes from S3 for key: {}",
@ -284,37 +237,18 @@ pub async fn get_from_bucket(
let content = if file_path.to_ascii_lowercase().ends_with(".pdf") { let content = if file_path.to_ascii_lowercase().ends_with(".pdf") {
debug!("Processing as PDF file: {}", file_path); debug!("Processing as PDF file: {}", file_path);
// Extract text from PDF using the `pdf_extract` crate
match pdf_extract::extract_text_from_mem(&bytes) { match pdf_extract::extract_text_from_mem(&bytes) {
Ok(text) => { Ok(text) => text,
debug!(
"Successfully extracted text from PDF, length: {}",
text.len()
);
text
}
Err(e) => { Err(e) => {
error!( error!("PDF extraction failed: {}", e);
"Failed to extract text from PDF for bucket {} key {}: {}",
bucket_name, file_path, e
);
return Err(format!("PDF extraction failed: {}", e).into()); return Err(format!("PDF extraction failed: {}", e).into());
} }
} }
} else { } else {
debug!("Processing as text file: {}", file_path);
// Convert bytes to a UTF8 String
match String::from_utf8(bytes) { match String::from_utf8(bytes) {
Ok(text) => { Ok(text) => text,
debug!("Successfully converted to UTF-8, length: {}", text.len()); Err(_) => {
text error!("File content is not valid UTF-8 text");
}
Err(e) => {
error!(
"Failed to convert S3 response to UTF-8 for bucket {} key {}: {}",
bucket_name, file_path, e
);
// If it's not valid UTF-8, return as base64 or error
return Err("File content is not valid UTF-8 text".into()); return Err("File content is not valid UTF-8 text".into());
} }
} }

View file

@ -1,10 +1,17 @@
use crate::shared::models::UserSession; use crate::shared::models::UserSession;
use crate::shared::state::AppState; use crate::shared::state::AppState;
use log::info; use log::{error, info};
use rhai::{Dynamic, Engine}; use rhai::{Dynamic, Engine};
use std::sync::Arc;
use std::time::Duration;
pub fn llm_keyword(state: &AppState, _user: UserSession, engine: &mut Engine) { /// Registers the `LLM` keyword for Rhai scripts.
let state_clone = state.clone(); /// Example usage inside Rhai:
/// ```rhai
/// result = LLM "Summarize the following text about AI:";
/// ```
pub fn llm_keyword(state: Arc<AppState>, _user: UserSession, engine: &mut Engine) {
let state_clone = Arc::clone(&state);
engine engine
.register_custom_syntax(&["LLM", "$expr$"], false, move |context, inputs| { .register_custom_syntax(&["LLM", "$expr$"], false, move |context, inputs| {
@ -12,20 +19,72 @@ pub fn llm_keyword(state: &AppState, _user: UserSession, engine: &mut Engine) {
info!("LLM processing text: {}", text); info!("LLM processing text: {}", text);
let state_inner = state_clone.clone(); let state_for_thread = Arc::clone(&state_clone);
let fut = execute_llm_generation(state_inner, text); let prompt = build_llm_prompt(&text);
let result = // ---- safe runtime isolation: no deadlocks possible ----
tokio::task::block_in_place(|| tokio::runtime::Handle::current().block_on(fut)) let (tx, rx) = std::sync::mpsc::channel();
.map_err(|e| format!("LLM generation failed: {}", e))?;
Ok(Dynamic::from(result)) std::thread::spawn(move || {
let rt = tokio::runtime::Builder::new_multi_thread()
.worker_threads(2)
.enable_all()
.build();
let send_err = if let Ok(rt) = rt {
let result = rt.block_on(async move {
execute_llm_generation(state_for_thread, prompt).await
});
tx.send(result).err()
} else {
tx.send(Err("failed to build tokio runtime".into())).err()
};
if send_err.is_some() {
error!("Failed to send LLM thread result");
}
});
match rx.recv_timeout(Duration::from_secs(60)) {
Ok(Ok(result)) => Ok(Dynamic::from(result)),
Ok(Err(e)) => Err(Box::new(rhai::EvalAltResult::ErrorRuntime(
e.to_string().into(),
rhai::Position::NONE,
))),
Err(std::sync::mpsc::RecvTimeoutError::Timeout) => {
Err(Box::new(rhai::EvalAltResult::ErrorRuntime(
"LLM generation timed out".into(),
rhai::Position::NONE,
)))
}
Err(e) => Err(Box::new(rhai::EvalAltResult::ErrorRuntime(
format!("LLM thread failed: {e}").into(),
rhai::Position::NONE,
))),
}
}) })
.unwrap(); .unwrap();
} }
/// Builds a consistent LLM prompt used by all Rhai scripts.
/// You can change the style/structure here to guide the model's behavior.
fn build_llm_prompt(user_text: &str) -> String {
format!(
"You are a AI assistant in form of KEYWORD called LLM
running inside a General Bots BASIC environment.
Task: Process and respond concisely to the following call to x = LLM 'prompt' syntax.
---
User Input:
{}
---
Respond clearly and accurately in the same language as the input.",
user_text.trim()
)
}
/// Runs the async LLM provider call safely.
pub async fn execute_llm_generation( pub async fn execute_llm_generation(
state: AppState, state: Arc<AppState>,
prompt: String, prompt: String,
) -> Result<String, Box<dyn std::error::Error + Send + Sync>> { ) -> Result<String, Box<dyn std::error::Error + Send + Sync>> {
info!("Starting LLM generation for prompt: '{}'", prompt); info!("Starting LLM generation for prompt: '{}'", prompt);

View file

@ -51,7 +51,7 @@ impl ScriptService {
first_keyword(&mut engine); first_keyword(&mut engine);
last_keyword(&mut engine); last_keyword(&mut engine);
format_keyword(&mut engine); format_keyword(&mut engine);
llm_keyword(&state, user.clone(), &mut engine); llm_keyword(state.clone(), user.clone(), &mut engine);
get_keyword(state.clone(), user.clone(), &mut engine); get_keyword(state.clone(), user.clone(), &mut engine);
set_keyword(&state, user.clone(), &mut engine); set_keyword(&state, user.clone(), &mut engine);
wait_keyword(&state, user.clone(), &mut engine); wait_keyword(&state, user.clone(), &mut engine);

View file

@ -1,7 +1,9 @@
TALK "Olá, pode me perguntar sobre qualquer coisa..." TALK "Olá, pode me perguntar sobre qualquer coisa..."
text = GET "default.gbdrive/default.pdf" let text = GET "default.gbdrive/default.pdf"
resume = LLM "Say Hello and present a a resume from " + text let resume = LLM "Say Hello and present a a resume from " + text
TALK resume TALK resume
SET_CONTEXT "Este é o documento que você deve usar para responder dúvidas: " + text SET_CONTEXT "Este é o documento que você deve usar para responder dúvidas: " + text
return true;

View file

@ -82,7 +82,7 @@
border-radius: 8px; border-radius: 8px;
color: #ffd700; color: #ffd700;
cursor: pointer; cursor: pointer;
margin-top: 60px; /* Moved down to create space */ margin-top: 60px;
margin-bottom: 15px; margin-bottom: 15px;
transition: all 0.3s ease; transition: all 0.3s ease;
font-weight: 600; font-weight: 600;
@ -436,6 +436,36 @@
box-shadow: 0 4px 12px rgba(0, 0, 0, 0.2); box-shadow: 0 4px 12px rgba(0, 0, 0, 0.2);
} }
.connection-status {
position: fixed;
top: 10px;
right: 10px;
padding: 8px 12px;
border-radius: 20px;
font-size: 12px;
font-weight: 600;
z-index: 1000;
transition: all 0.3s ease;
}
.connection-status.connected {
background: rgba(100, 255, 100, 0.2);
border: 1px solid rgba(100, 255, 100, 0.4);
color: #90ff90;
}
.connection-status.disconnected {
background: rgba(255, 100, 100, 0.2);
border: 1px solid rgba(255, 100, 100, 0.4);
color: #ff9090;
}
.connection-status.connecting {
background: rgba(255, 215, 0, 0.2);
border: 1px solid rgba(255, 215, 0, 0.4);
color: #ffd700;
}
/* Markdown Styles */ /* Markdown Styles */
.markdown-content h1, .markdown-content h1,
.markdown-content h2, .markdown-content h2,
@ -616,6 +646,13 @@
height: 60px; height: 60px;
font-size: 36px; font-size: 36px;
} }
.connection-status {
top: 5px;
right: 5px;
font-size: 10px;
padding: 6px 10px;
}
} }
@media (max-width: 480px) { @media (max-width: 480px) {
@ -651,6 +688,10 @@
</style> </style>
</head> </head>
<body> <body>
<div class="connection-status connecting" id="connectionStatus">
🔄 Conectando...
</div>
<button class="sidebar-toggle" onclick="toggleSidebar()"></button> <button class="sidebar-toggle" onclick="toggleSidebar()"></button>
<div class="sidebar" id="sidebar"> <div class="sidebar" id="sidebar">
@ -716,11 +757,16 @@
let isThinking = false; let isThinking = false;
let currentStreamingContent = ""; let currentStreamingContent = "";
let hasReceivedInitialMessage = false; let hasReceivedInitialMessage = false;
let reconnectAttempts = 0;
const maxReconnectAttempts = 5;
let reconnectTimeout = null;
const messagesDiv = document.getElementById("messages"); const messagesDiv = document.getElementById("messages");
const input = document.getElementById("messageInput"); const input = document.getElementById("messageInput");
const sendBtn = document.getElementById("sendBtn"); const sendBtn = document.getElementById("sendBtn");
const newChatBtn = document.getElementById("newChatBtn"); const newChatBtn = document.getElementById("newChatBtn");
const connectionStatus =
document.getElementById("connectionStatus");
marked.setOptions({ marked.setOptions({
breaks: true, breaks: true,
@ -731,6 +777,17 @@
document.getElementById("sidebar").classList.toggle("open"); document.getElementById("sidebar").classList.toggle("open");
} }
function updateConnectionStatus(status, message) {
connectionStatus.className = `connection-status ${status}`;
connectionStatus.textContent = message;
}
function getWebSocketUrl() {
const protocol =
window.location.protocol === "https:" ? "wss:" : "ws:";
return `${protocol}//${window.location.host}/ws?session_id=${currentSessionId}&user_id=${currentUserId}`;
}
// Auto-focus on input when page loads // Auto-focus on input when page loads
window.addEventListener("load", function () { window.addEventListener("load", function () {
input.focus(); input.focus();
@ -753,6 +810,7 @@
async function initializeAuth() { async function initializeAuth() {
try { try {
updateConnectionStatus("connecting", "🔄 Conectando...");
const response = await fetch("/api/auth"); const response = await fetch("/api/auth");
const authData = await response.json(); const authData = await response.json();
currentUserId = authData.user_id; currentUserId = authData.user_id;
@ -762,6 +820,11 @@
await triggerStartScript(); await triggerStartScript();
} catch (error) { } catch (error) {
console.error("Failed to initialize auth:", error); console.error("Failed to initialize auth:", error);
updateConnectionStatus(
"disconnected",
"❌ Erro de conexão",
);
setTimeout(initializeAuth, 3000);
} }
} }
@ -870,13 +933,10 @@
if (ws) { if (ws) {
ws.close(); ws.close();
} }
const wsUrl =
"ws://" + clearTimeout(reconnectTimeout);
window.location.host +
"/ws?session_id=" + const wsUrl = getWebSocketUrl();
currentSessionId +
"&user_id=" +
currentUserId;
ws = new WebSocket(wsUrl); ws = new WebSocket(wsUrl);
ws.onmessage = function (event) { ws.onmessage = function (event) {
@ -893,16 +953,48 @@
ws.onopen = function () { ws.onopen = function () {
console.log("Connected to WebSocket"); console.log("Connected to WebSocket");
updateConnectionStatus("connected", "✅ Conectado");
reconnectAttempts = 0;
// Reset the flag when connection is established // Reset the flag when connection is established
hasReceivedInitialMessage = false; hasReceivedInitialMessage = false;
}; };
ws.onclose = function () { ws.onclose = function (event) {
console.log("WebSocket disconnected"); console.log(
"WebSocket disconnected:",
event.code,
event.reason,
);
updateConnectionStatus("disconnected", "❌ Desconectado");
if (reconnectAttempts < maxReconnectAttempts) {
reconnectAttempts++;
const delay = Math.min(1000 * reconnectAttempts, 10000);
console.log(
`Reconnecting in ${delay}ms... (attempt ${reconnectAttempts})`,
);
reconnectTimeout = setTimeout(() => {
updateConnectionStatus(
"connecting",
`🔄 Reconectando... (${reconnectAttempts}/${maxReconnectAttempts})`,
);
connectWebSocket();
}, delay);
} else {
updateConnectionStatus(
"disconnected",
"❌ Conexão perdida",
);
}
}; };
ws.onerror = function (error) { ws.onerror = function (error) {
console.error("WebSocket error:", error); console.error("WebSocket error:", error);
updateConnectionStatus(
"disconnected",
"❌ Erro de conexão",
);
}; };
} }
@ -1124,7 +1216,15 @@
function sendMessage() { function sendMessage() {
const message = input.value.trim(); const message = input.value.trim();
if (!message || !ws || ws.readyState !== WebSocket.OPEN) return; if (!message || !ws || ws.readyState !== WebSocket.OPEN) {
if (!ws || ws.readyState !== WebSocket.OPEN) {
showWarning(
"Conexão não disponível. Tentando reconectar...",
);
connectWebSocket();
}
return;
}
if (isThinking) { if (isThinking) {
hideThinkingIndicator(); hideThinkingIndicator();
@ -1195,6 +1295,7 @@
} }
} catch (error) { } catch (error) {
console.error("Failed to start voice session:", error); console.error("Failed to start voice session:", error);
showWarning("Falha ao iniciar modo de voz");
} }
} }
@ -1223,7 +1324,11 @@
async function connectToVoiceRoom(token) { async function connectToVoiceRoom(token) {
try { try {
const room = new LiveKitClient.Room(); const room = new LiveKitClient.Room();
await room.connect("ws://localhost:7880", token); // Use o mesmo esquema (ws/wss) do WebSocket principal
const protocol =
window.location.protocol === "https:" ? "wss:" : "ws:";
const voiceUrl = `${protocol}//${window.location.host}/voice`;
await room.connect(voiceUrl, token);
voiceRoom = room; voiceRoom = room;
room.on("dataReceived", (data) => { room.on("dataReceived", (data) => {
@ -1248,6 +1353,7 @@
} }
} catch (error) { } catch (error) {
console.error("Failed to connect to voice room:", error); console.error("Failed to connect to voice room:", error);
showWarning("Falha na conexão de voz");
} }
} }
@ -1291,6 +1397,7 @@
}) })
.catch((error) => { .catch((error) => {
console.error("Error accessing microphone:", error); console.error("Error accessing microphone:", error);
showWarning("Erro ao acessar microfone");
}); });
} }
@ -1322,7 +1429,15 @@
addMessage("voice", `🎤 ${randomPhrase}`); addMessage("voice", `🎤 ${randomPhrase}`);
} }
initializeAuth(); // Inicializar quando a página carregar
window.addEventListener("load", initializeAuth);
// Tentar reconectar quando a página ganhar foco
window.addEventListener("focus", function () {
if (!ws || ws.readyState !== WebSocket.OPEN) {
connectWebSocket();
}
});
</script> </script>
</body> </body>
</html> </html>