+
diff --git a/crates/openfang-api/static/js/app.js b/crates/openfang-api/static/js/app.js
index 5c5d87c5..987c13eb 100644
--- a/crates/openfang-api/static/js/app.js
+++ b/crates/openfang-api/static/js/app.js
@@ -158,7 +158,7 @@ document.addEventListener('alpine:init', function() {
await OpenFangAPI.get('/api/providers');
this.showAuthPrompt = false;
} catch(e) {
- if (e.message && e.message.indexOf('401') >= 0) {
+ if (e.message && (e.message.indexOf('Not authorized') >= 0 || e.message.indexOf('401') >= 0 || e.message.indexOf('Missing Authorization') >= 0)) {
this.showAuthPrompt = true;
}
}
diff --git a/crates/openfang-cli/src/main.rs b/crates/openfang-cli/src/main.rs
index 5d908ff4..df8f7cbb 100644
--- a/crates/openfang-cli/src/main.rs
+++ b/crates/openfang-cli/src/main.rs
@@ -953,14 +953,20 @@ pub(crate) fn restrict_dir_permissions(_path: &std::path::Path) {}
pub(crate) fn find_daemon() -> Option {
let home_dir = dirs::home_dir()?.join(".openfang");
let info = read_daemon_info(&home_dir)?;
- let url = format!("http://{}/api/health", info.listen_addr);
+
+ // Normalize listen address: replace 0.0.0.0 with 127.0.0.1 to avoid
+ // DNS/connectivity issues on macOS where 0.0.0.0 can hang.
+ let addr = info.listen_addr.replace("0.0.0.0", "127.0.0.1");
+ let url = format!("http://{addr}/api/health");
+
let client = reqwest::blocking::Client::builder()
+ .connect_timeout(std::time::Duration::from_secs(1))
.timeout(std::time::Duration::from_secs(2))
.build()
.ok()?;
let resp = client.get(&url).send().ok()?;
if resp.status().is_success() {
- Some(format!("http://{}", info.listen_addr))
+ Some(format!("http://{addr}"))
} else {
None
}
diff --git a/crates/openfang-kernel/src/cron.rs b/crates/openfang-kernel/src/cron.rs
index c1c33852..a7d7cd4d 100644
--- a/crates/openfang-kernel/src/cron.rs
+++ b/crates/openfang-kernel/src/cron.rs
@@ -222,16 +222,24 @@ impl CronScheduler {
}
/// Return jobs whose `next_run` is at or before `now` and are enabled.
+ ///
+ /// **Important**: This also pre-advances each due job's `next_run` to the
+ /// next scheduled time. This prevents the same job from being returned as
+ /// "due" on subsequent tick iterations while it's still executing.
pub fn due_jobs(&self) -> Vec {
let now = Utc::now();
- self.jobs
- .iter()
- .filter(|r| {
- let meta = r.value();
- meta.job.enabled && meta.job.next_run.map(|t| t <= now).unwrap_or(false)
- })
- .map(|r| r.value().job.clone())
- .collect()
+ let mut due = Vec::new();
+ for mut entry in self.jobs.iter_mut() {
+ let meta = entry.value_mut();
+ if meta.job.enabled && meta.job.next_run.map(|t| t <= now).unwrap_or(false) {
+ due.push(meta.job.clone());
+ // Pre-advance next_run so the job won't fire again on the next
+ // tick while it's still executing. record_success/record_failure
+ // will recompute it again after execution completes.
+ meta.job.next_run = Some(compute_next_run(&meta.job.schedule));
+ }
+ }
+ due
}
// -- Outcome recording --------------------------------------------------
diff --git a/crates/openfang-kernel/src/kernel.rs b/crates/openfang-kernel/src/kernel.rs
index 2c4b858c..3d3e34f9 100644
--- a/crates/openfang-kernel/src/kernel.rs
+++ b/crates/openfang-kernel/src/kernel.rs
@@ -3095,6 +3095,8 @@ impl OpenFangKernel {
let kernel = Arc::clone(self);
tokio::spawn(async move {
let mut interval = tokio::time::interval(std::time::Duration::from_secs(15));
+ // Use Skip to avoid burst-firing after a long job blocks the loop.
+ interval.set_missed_tick_behavior(tokio::time::MissedTickBehavior::Skip);
let mut persist_counter = 0u32;
interval.tick().await; // Skip first immediate tick
loop {