Background thread that wakes J.A.R.V.I.S. on a schedule to speak reminders.
Nothing else competes here on desktop — Алиса/Сири are reactive-only.
Core (crates/jarvis-core/src/scheduler.rs)
- Schedule::{Daily{h,m}, Interval{secs}, Once{at}} with Schedule::parse for
"daily HH:MM" / "at HH:MM" / "every N minutes|hours" / "in N minutes|hours".
Russian units (час/часа/часов/минут/секунд) also accepted.
- ScheduledTask {id, name, schedule, action, last_fired, enabled, created_at}.
Action::Speak{text} | Action::Lua{script_path}.
- JSON persistence at <APP_CONFIG_DIR>/schedule.json, atomic write-through.
- add/remove/clear/list/find; mark_fired auto-deletes Once tasks.
- start_background() spawns a 30-second tick thread (idempotent). Each tick
calls due_tasks(), fires Action via tts::speak_default (after voices::play_reply
"ahem" cue) or Lua engine.
- 7 unit tests (all passing).
Lua API (crates/jarvis-core/src/lua/api/scheduler.rs)
- jarvis.scheduler.add({name, schedule, action={type, text|script_path}})
- jarvis.scheduler.{list, count, remove(id), clear}.
- Tasks come back as {id, name, schedule_human, action, enabled, last_fired}.
Wire-up (crates/jarvis-app/src/main.rs)
- scheduler::init() + scheduler::start_background() after profiles::init.
- Tasks survive restarts via schedule.json.
Voice commands (resources/commands/scheduler/, 6 ids)
- scheduler.add_reminder "напомни через 5 минут выключить кофеварку"
- scheduler.add_at "напомни в 18:00 забрать ребёнка"
- scheduler.add_recurring "каждые 2 часа напоминай попить воды"
- scheduler.add_daily "каждый день в 9:00 делай briefing"
- scheduler.list "что у меня запланировано"
- scheduler.clear "очисти расписание"
Russian-aware parsers (час/часа/часов, минут/минуту/минуты) live inside the Lua
packs — easy to extend without touching Rust.
Tests: 31/31 jarvis-core unit tests pass (24 prior + 7 scheduler).
Build: cargo build --release -p jarvis-app and -p jarvis-gui both green.
242 lines
7.6 KiB
Rust
242 lines
7.6 KiB
Rust
use jarvis_core::slots;
|
|
use std::sync::Arc;
|
|
use std::sync::atomic::{AtomicBool, Ordering};
|
|
use std::sync::mpsc;
|
|
|
|
// include core
|
|
use jarvis_core::{
|
|
audio, audio_processing, commands, config, db, listener, recorder, stt, intent,
|
|
ipc::{self, IpcAction},
|
|
i18n, voices, models,
|
|
APP_CONFIG_DIR, APP_LOG_DIR, COMMANDS_LIST, DB,
|
|
};
|
|
|
|
// include log
|
|
#[macro_use]
|
|
extern crate simple_log;
|
|
mod log;
|
|
|
|
// include app
|
|
mod app;
|
|
mod llm_fallback;
|
|
mod llm_router;
|
|
|
|
// include tray
|
|
// @TODO. macOS currently not supported for tray functionality.
|
|
#[cfg(not(target_os = "macos"))]
|
|
mod tray;
|
|
|
|
static SHOULD_STOP: AtomicBool = AtomicBool::new(false);
|
|
|
|
fn main() -> Result<(), String> {
|
|
load_dotenv_near_exe();
|
|
|
|
eprintln!("[jarvis-app] step: init_dirs");
|
|
config::init_dirs()?;
|
|
|
|
eprintln!("[jarvis-app] step: init_logging");
|
|
log::init_logging()?;
|
|
|
|
info!("Starting Jarvis v{} ...", config::APP_VERSION.unwrap());
|
|
info!("Config directory is: {}", APP_CONFIG_DIR.get().unwrap().display());
|
|
info!("Log directory is: {}", APP_LOG_DIR.get().unwrap().display());
|
|
|
|
eprintln!("[jarvis-app] step: db::init");
|
|
let settings = db::init();
|
|
|
|
DB.set(settings.arc().clone())
|
|
.expect("DB already initialized");
|
|
|
|
eprintln!("[jarvis-app] step: voices::init");
|
|
let voice_id = settings.lock().voice.clone();
|
|
let language = settings.lock().language.clone();
|
|
if let Err(e) = voices::init(&voice_id, &language) {
|
|
warn!("Failed to init voices: {}", e);
|
|
}
|
|
|
|
eprintln!("[jarvis-app] step: i18n::init");
|
|
i18n::init(&settings.lock().language);
|
|
|
|
eprintln!("[jarvis-app] step: llm_fallback::init");
|
|
llm_fallback::init();
|
|
|
|
eprintln!("[jarvis-app] step: llm_router::init");
|
|
llm_router::init();
|
|
|
|
eprintln!("[jarvis-app] step: long_term_memory::init");
|
|
if let Err(e) = jarvis_core::long_term_memory::init() {
|
|
warn!("Long-term memory init failed: {}", e);
|
|
}
|
|
|
|
eprintln!("[jarvis-app] step: profiles::init");
|
|
if let Err(e) = jarvis_core::profiles::init() {
|
|
warn!("Profiles init failed: {}", e);
|
|
}
|
|
|
|
eprintln!("[jarvis-app] step: scheduler::init + background");
|
|
if let Err(e) = jarvis_core::scheduler::init() {
|
|
warn!("Scheduler init failed: {}", e);
|
|
} else {
|
|
jarvis_core::scheduler::start_background();
|
|
}
|
|
|
|
eprintln!("[jarvis-app] step: recorder::init");
|
|
if recorder::init().is_err() {
|
|
notify_mic_problem();
|
|
app::close(1, "recorder::init failed");
|
|
}
|
|
|
|
eprintln!("[jarvis-app] step: models::init");
|
|
if let Err(e) = models::init() {
|
|
warn!("Models registry init failed: {}", e);
|
|
}
|
|
|
|
eprintln!("[jarvis-app] step: stt::init");
|
|
if stt::init().is_err() {
|
|
app::close(1, "stt::init failed");
|
|
}
|
|
|
|
eprintln!("[jarvis-app] step: commands::parse_commands");
|
|
info!("Initializing commands.");
|
|
let cmds = match commands::parse_commands() {
|
|
Ok(c) => c,
|
|
Err(e) => {
|
|
warn!("Failed to parse commands: {}. Starting with empty command list.", e);
|
|
Vec::new()
|
|
}
|
|
};
|
|
info!("Commands initialized. Count: {}, List: {:?}", cmds.len(), commands::list_paths(&cmds));
|
|
COMMANDS_LIST.set(cmds).unwrap();
|
|
|
|
eprintln!("[jarvis-app] step: audio::init");
|
|
if audio::init().is_err() {
|
|
app::close(1, "audio::init failed");
|
|
}
|
|
|
|
eprintln!("[jarvis-app] step: listener::init");
|
|
if let Err(e) = listener::init() {
|
|
error!("Wake-word engine init failed: {}", e);
|
|
app::close(1, "listener::init failed");
|
|
}
|
|
|
|
eprintln!("[jarvis-app] step: tokio runtime");
|
|
let rt = Arc::new(
|
|
tokio::runtime::Runtime::new().expect("Failed to create tokio runtime")
|
|
);
|
|
|
|
eprintln!("[jarvis-app] step: intent::init");
|
|
rt.block_on(async {
|
|
if let Err(e) = intent::init(COMMANDS_LIST.get().unwrap()).await {
|
|
error!("Failed to initialize intent classifier: {}", e);
|
|
app::close(1, "intent::init failed");
|
|
}
|
|
});
|
|
|
|
eprintln!("[jarvis-app] step: slots::init");
|
|
slots::init().map_err(|e| error!("Slot extraction init failed: {}", e)).ok();
|
|
|
|
eprintln!("[jarvis-app] step: audio_processing::init");
|
|
info!("Initializing audio processing...");
|
|
if let Err(e) = audio_processing::init() {
|
|
warn!("Audio processing init failed: {}", e);
|
|
}
|
|
|
|
eprintln!("[jarvis-app] step: ipc::init");
|
|
info!("Initializing IPC...");
|
|
ipc::init();
|
|
|
|
// channel for text commands (manually written in the GUI)
|
|
let (text_cmd_tx, text_cmd_rx) = mpsc::channel::<String>();
|
|
|
|
ipc::set_action_handler(move |action| {
|
|
match action {
|
|
IpcAction::Stop => {
|
|
info!("Received stop command from GUI");
|
|
SHOULD_STOP.store(true, Ordering::SeqCst);
|
|
}
|
|
IpcAction::ReloadCommands => {
|
|
info!("Received reload commands request");
|
|
// TODO: implement reload
|
|
}
|
|
IpcAction::SetMuted { muted } => {
|
|
info!("Received mute request: {}", muted);
|
|
// TODO: implement mute
|
|
}
|
|
IpcAction::TextCommand { text } => {
|
|
info!("Received text command: {}", text);
|
|
if let Err(e) = text_cmd_tx.send(text) {
|
|
error!("Failed to send text command to app: {}", e);
|
|
}
|
|
}
|
|
IpcAction::Ping => {
|
|
// handled internally by server
|
|
}
|
|
_ => {}
|
|
}
|
|
});
|
|
|
|
// start WebSocket server on the shared runtime
|
|
let ipc_rt = Arc::clone(&rt);
|
|
std::thread::spawn(move || {
|
|
ipc_rt.block_on(ipc::start_server());
|
|
});
|
|
|
|
eprintln!("[jarvis-app] step: spawn app thread");
|
|
let app_rt = Arc::clone(&rt);
|
|
std::thread::spawn(move || {
|
|
let _ = app::start(text_cmd_rx, &app_rt);
|
|
});
|
|
|
|
eprintln!("[jarvis-app] step: tray::init_blocking");
|
|
tray::init_blocking(settings);
|
|
|
|
eprintln!("[jarvis-app] step: main returning Ok");
|
|
Ok(())
|
|
}
|
|
|
|
pub fn should_stop() -> bool {
|
|
SHOULD_STOP.load(Ordering::SeqCst)
|
|
}
|
|
|
|
// Look for dev.env next to the exe, then walk parents until we find one.
|
|
// Lets the user double-click jarvis-gui.exe / jarvis-app.exe without needing
|
|
// a wrapper .bat to pre-load GROQ_TOKEN and similar secrets.
|
|
fn load_dotenv_near_exe() {
|
|
if let Ok(exe) = std::env::current_exe() {
|
|
let mut dir = exe.parent().map(|p| p.to_path_buf());
|
|
for _ in 0..5 {
|
|
if let Some(d) = &dir {
|
|
let candidate = d.join("dev.env");
|
|
if candidate.is_file() {
|
|
let _ = dotenvy::from_path(&candidate);
|
|
eprintln!("[jarvis-app] loaded env: {}", candidate.display());
|
|
return;
|
|
}
|
|
dir = d.parent().map(|p| p.to_path_buf());
|
|
}
|
|
}
|
|
}
|
|
let _ = dotenvy::dotenv();
|
|
}
|
|
|
|
#[cfg(target_os = "windows")]
|
|
fn notify_mic_problem() {
|
|
use winrt_notification::{Toast, Duration as ToastDuration};
|
|
|
|
let _ = Toast::new(Toast::POWERSHELL_APP_ID)
|
|
.title("J.A.R.V.I.S.: микрофон не найден")
|
|
.text1("Windows не видит ни одного устройства записи.")
|
|
.text2("Откройте mmsys.cpl → Recording → включите микрофон и перезапустите Jarvis.")
|
|
.duration(ToastDuration::Long)
|
|
.show();
|
|
|
|
// Open Sound recording settings so the user can fix it in two clicks.
|
|
let _ = std::process::Command::new("cmd")
|
|
.args(["/C", "start", "", "ms-settings:sound"])
|
|
.spawn();
|
|
}
|
|
|
|
#[cfg(not(target_os = "windows"))]
|
|
fn notify_mic_problem() {
|
|
eprintln!("[jarvis-app] no recording device detected; check OS audio settings");
|
|
}
|